Commit f573c8b0 authored by Michael Kifer's avatar Michael Kifer
Browse files

* viper.el: Bumped up version/date of update to reflect the substantial

	changes done in August 2006.

	* viper-cmd (viper-next-line-at-bol): make sure button-at, push-button
	are defined.

	* ediff-util.el (ediff-add-to-history): new function.

	* ediff.el: use ediff-add-to-history instead of add-to-history.
parent 2b1119a0
2006-09-18 Michael Kifer <kifer@cs.stonybrook.edu>
* viper.el: Bumped up version/date of update to reflect the substantial
changes done in August 2006.
* viper-cmd (viper-next-line-at-bol): make sure button-at, push-button
are defined.
* ediff-util.el (ediff-add-to-history): new function.
* ediff.el: use ediff-add-to-history instead of add-to-history.
2006-09-18 Wolfgang Jenkner <wjenkner@inode.at> (tiny change) 2006-09-18 Wolfgang Jenkner <wjenkner@inode.at> (tiny change)
   
* textmodes/conf-mode.el (conf-space-mode): Doc fix. * textmodes/conf-mode.el (conf-space-mode): Doc fix.
......
...@@ -4281,6 +4281,11 @@ Mail anyway? (y or n) ") ...@@ -4281,6 +4281,11 @@ Mail anyway? (y or n) ")
(setq lis1 (cdr lis1))) (setq lis1 (cdr lis1)))
(cdr result))) (cdr result)))
(defun ediff-add-to-history (history-var newelt)
(if (fboundp 'add-to-history)
(add-to-history history-var newelt)
(set history-var (cons newelt (symbol-value history-var)))))
(if (fboundp 'copy-sequence) (if (fboundp 'copy-sequence)
(defalias 'ediff-copy-list 'copy-sequence) (defalias 'ediff-copy-list 'copy-sequence)
(defun ediff-copy-list (list) (defun ediff-copy-list (list)
......
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
;; Created: February 2, 1994 ;; Created: February 2, 1994
;; Keywords: comparing, merging, patching, tools, unix ;; Keywords: comparing, merging, patching, tools, unix
(defconst ediff-version "2.81" "The current version of Ediff") (defconst ediff-version "2.81.1" "The current version of Ediff")
(defconst ediff-date "February 18, 2006" "Date of last update") (defconst ediff-date "September 18, 2006" "Date of last update")
;; This file is part of GNU Emacs. ;; This file is part of GNU Emacs.
...@@ -210,11 +210,12 @@ ...@@ -210,11 +210,12 @@
ediff-last-dir-B ediff-last-dir-B
(file-name-directory f))) (file-name-directory f)))
(progn (progn
(add-to-history 'file-name-history (ediff-add-to-history
(ediff-abbreviate-file-name 'file-name-history
(expand-file-name (ediff-abbreviate-file-name
(file-name-nondirectory f) (expand-file-name
dir-B))) (file-name-nondirectory f)
dir-B)))
(ediff-get-default-file-name f 1))) (ediff-get-default-file-name f 1)))
))) )))
(ediff-files-internal file-A (ediff-files-internal file-A
...@@ -245,22 +246,24 @@ ...@@ -245,22 +246,24 @@
ediff-last-dir-B ediff-last-dir-B
(file-name-directory f))) (file-name-directory f)))
(progn (progn
(add-to-history 'file-name-history (ediff-add-to-history
(ediff-abbreviate-file-name 'file-name-history
(expand-file-name (ediff-abbreviate-file-name
(file-name-nondirectory f) (expand-file-name
dir-B))) (file-name-nondirectory f)
dir-B)))
(ediff-get-default-file-name f 1)))) (ediff-get-default-file-name f 1))))
(ediff-read-file-name "File C to compare" (ediff-read-file-name "File C to compare"
(setq dir-C (if ediff-use-last-dir (setq dir-C (if ediff-use-last-dir
ediff-last-dir-C ediff-last-dir-C
(file-name-directory ff))) (file-name-directory ff)))
(progn (progn
(add-to-history 'file-name-history (ediff-add-to-history
(ediff-abbreviate-file-name 'file-name-history
(expand-file-name (ediff-abbreviate-file-name
(file-name-nondirectory ff) (expand-file-name
dir-C))) (file-name-nondirectory ff)
dir-C)))
(ediff-get-default-file-name ff 2))) (ediff-get-default-file-name ff 2)))
))) )))
(ediff-files-internal file-A (ediff-files-internal file-A
...@@ -1103,11 +1106,12 @@ lines. For small regions, use `ediff-regions-wordwise'." ...@@ -1103,11 +1106,12 @@ lines. For small regions, use `ediff-regions-wordwise'."
ediff-last-dir-B ediff-last-dir-B
(file-name-directory f))) (file-name-directory f)))
(progn (progn
(add-to-history 'file-name-history (ediff-add-to-history
(ediff-abbreviate-file-name 'file-name-history
(expand-file-name (ediff-abbreviate-file-name
(file-name-nondirectory f) (expand-file-name
dir-B))) (file-name-nondirectory f)
dir-B)))
(ediff-get-default-file-name f 1))) (ediff-get-default-file-name f 1)))
))) )))
(setq startup-hooks (cons 'ediff-merge-on-startup startup-hooks)) (setq startup-hooks (cons 'ediff-merge-on-startup startup-hooks))
...@@ -1146,11 +1150,12 @@ lines. For small regions, use `ediff-regions-wordwise'." ...@@ -1146,11 +1150,12 @@ lines. For small regions, use `ediff-regions-wordwise'."
ediff-last-dir-B ediff-last-dir-B
(file-name-directory f))) (file-name-directory f)))
(progn (progn
(add-to-history 'file-name-history (ediff-add-to-history
(ediff-abbreviate-file-name 'file-name-history
(expand-file-name (ediff-abbreviate-file-name
(file-name-nondirectory f) (expand-file-name
dir-B))) (file-name-nondirectory f)
dir-B)))
(ediff-get-default-file-name f 1)))) (ediff-get-default-file-name f 1))))
(ediff-read-file-name "Ancestor file" (ediff-read-file-name "Ancestor file"
(setq dir-ancestor (setq dir-ancestor
...@@ -1158,11 +1163,12 @@ lines. For small regions, use `ediff-regions-wordwise'." ...@@ -1158,11 +1163,12 @@ lines. For small regions, use `ediff-regions-wordwise'."
ediff-last-dir-ancestor ediff-last-dir-ancestor
(file-name-directory ff))) (file-name-directory ff)))
(progn (progn
(add-to-history 'file-name-history (ediff-add-to-history
(ediff-abbreviate-file-name 'file-name-history
(expand-file-name (ediff-abbreviate-file-name
(file-name-nondirectory ff) (expand-file-name
dir-ancestor))) (file-name-nondirectory ff)
dir-ancestor)))
(ediff-get-default-file-name ff 2))) (ediff-get-default-file-name ff 2)))
))) )))
(setq startup-hooks (cons 'ediff-merge-on-startup startup-hooks)) (setq startup-hooks (cons 'ediff-merge-on-startup startup-hooks))
......
...@@ -3098,7 +3098,7 @@ If point is on a widget or a button, simulate clicking on that widget/button." ...@@ -3098,7 +3098,7 @@ If point is on a widget or a button, simulate clicking on that widget/button."
(and (consp widget) (and (consp widget)
(get (widget-type widget) 'widget-type)))) (get (widget-type widget) 'widget-type))))
(widget-button-press (point)) (widget-button-press (point))
(if (button-at (point)) (if (and (fboundp 'button-at) (fboundp 'push-button) (button-at (point)))
(push-button) (push-button)
;; not a widget or a button ;; not a widget or a button
(viper-leave-region-active) (viper-leave-region-active)
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
;; Author: Michael Kifer <kifer@cs.stonybrook.edu> ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
;; Keywords: emulations ;; Keywords: emulations
(defconst viper-version "3.12 of February 18, 2006" (defconst viper-version "3.13 of September 18, 2006"
"The current version of Viper") "The current version of Viper")
;; This file is part of GNU Emacs. ;; This file is part of GNU Emacs.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment