summaryrefslogtreecommitdiff
path: root/lisp/vc/emerge.el
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/vc/emerge.el')
-rw-r--r--lisp/vc/emerge.el2
1 files changed, 2 insertions, 0 deletions
diff --git a/lisp/vc/emerge.el b/lisp/vc/emerge.el
index 422ed5c0a4d..de09be80e7c 100644
--- a/lisp/vc/emerge.el
+++ b/lisp/vc/emerge.el
@@ -2942,6 +2942,7 @@ If some prefix of KEY has a non-prefix definition, it is redefined."
;; Define a key if it (or a prefix) is not already defined in the map.
(defun emerge-define-key-if-possible (keymap key definition)
+ (declare (obsolete keymap-set "29.1"))
;; look up the present definition of the key
(let ((present (lookup-key keymap key)))
(if (integerp present)
@@ -2959,6 +2960,7 @@ If some prefix of KEY has a non-prefix definition, it is redefined."
If the name won't fit on one line, the minibuffer is expanded to hold it,
and the command waits for a keystroke from the user. If the keystroke is
SPC, it is ignored; if it is anything else, it is processed as a command."
+ (declare (obsolete nil "29.1"))
(interactive)
(let ((name (buffer-file-name)))
(or name