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)
 
* textmodes/conf-mode.el (conf-space-mode): Doc fix.
......
......@@ -4281,6 +4281,11 @@ Mail anyway? (y or n) ")
(setq lis1 (cdr lis1)))
(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)
(defalias 'ediff-copy-list 'copy-sequence)
(defun ediff-copy-list (list)
......
......@@ -7,8 +7,8 @@
;; Created: February 2, 1994
;; Keywords: comparing, merging, patching, tools, unix
(defconst ediff-version "2.81" "The current version of Ediff")
(defconst ediff-date "February 18, 2006" "Date of last update")
(defconst ediff-version "2.81.1" "The current version of Ediff")
(defconst ediff-date "September 18, 2006" "Date of last update")
;; This file is part of GNU Emacs.
......@@ -210,7 +210,8 @@
ediff-last-dir-B
(file-name-directory f)))
(progn
(add-to-history 'file-name-history
(ediff-add-to-history
'file-name-history
(ediff-abbreviate-file-name
(expand-file-name
(file-name-nondirectory f)
......@@ -245,7 +246,8 @@
ediff-last-dir-B
(file-name-directory f)))
(progn
(add-to-history 'file-name-history
(ediff-add-to-history
'file-name-history
(ediff-abbreviate-file-name
(expand-file-name
(file-name-nondirectory f)
......@@ -256,7 +258,8 @@
ediff-last-dir-C
(file-name-directory ff)))
(progn
(add-to-history 'file-name-history
(ediff-add-to-history
'file-name-history
(ediff-abbreviate-file-name
(expand-file-name
(file-name-nondirectory ff)
......@@ -1103,7 +1106,8 @@ lines. For small regions, use `ediff-regions-wordwise'."
ediff-last-dir-B
(file-name-directory f)))
(progn
(add-to-history 'file-name-history
(ediff-add-to-history
'file-name-history
(ediff-abbreviate-file-name
(expand-file-name
(file-name-nondirectory f)
......@@ -1146,7 +1150,8 @@ lines. For small regions, use `ediff-regions-wordwise'."
ediff-last-dir-B
(file-name-directory f)))
(progn
(add-to-history 'file-name-history
(ediff-add-to-history
'file-name-history
(ediff-abbreviate-file-name
(expand-file-name
(file-name-nondirectory f)
......@@ -1158,7 +1163,8 @@ lines. For small regions, use `ediff-regions-wordwise'."
ediff-last-dir-ancestor
(file-name-directory ff)))
(progn
(add-to-history 'file-name-history
(ediff-add-to-history
'file-name-history
(ediff-abbreviate-file-name
(expand-file-name
(file-name-nondirectory ff)
......
......@@ -3098,7 +3098,7 @@ If point is on a widget or a button, simulate clicking on that widget/button."
(and (consp widget)
(get (widget-type widget) 'widget-type))))
(widget-button-press (point))
(if (button-at (point))
(if (and (fboundp 'button-at) (fboundp 'push-button) (button-at (point)))
(push-button)
;; not a widget or a button
(viper-leave-region-active)
......
......@@ -9,7 +9,7 @@
;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
;; 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")
;; 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