diff options
| author | Juanma Barranquero | 2008-04-18 10:32:16 +0000 |
|---|---|---|
| committer | Juanma Barranquero | 2008-04-18 10:32:16 +0000 |
| commit | 85744fc9b48de6507c55c1facdb75a464569d313 (patch) | |
| tree | ab9c902070e58383d5996c6c5c9cc17546219cf6 | |
| parent | 82061ebfd74f189a45f1b6a0fa5b9f59343440a6 (diff) | |
| download | emacs-85744fc9b48de6507c55c1facdb75a464569d313.tar.gz emacs-85744fc9b48de6507c55c1facdb75a464569d313.zip | |
(lisp-comment-indent): Add WHEN to obsolescence declaration.
| -rw-r--r-- | lisp/emacs-lisp/lisp-mode.el | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el index 8c24a44b71b..9968a9a2f0c 100644 --- a/lisp/emacs-lisp/lisp-mode.el +++ b/lisp/emacs-lisp/lisp-mode.el | |||
| @@ -270,7 +270,7 @@ | |||
| 270 | map) | 270 | map) |
| 271 | "Keymap for commands shared by all sorts of Lisp modes.") | 271 | "Keymap for commands shared by all sorts of Lisp modes.") |
| 272 | 272 | ||
| 273 | (defvar emacs-lisp-mode-map | 273 | (defvar emacs-lisp-mode-map |
| 274 | (let ((map (make-sparse-keymap "Emacs-Lisp")) | 274 | (let ((map (make-sparse-keymap "Emacs-Lisp")) |
| 275 | (menu-map (make-sparse-keymap "Emacs-Lisp")) | 275 | (menu-map (make-sparse-keymap "Emacs-Lisp")) |
| 276 | (prof-map (make-sparse-keymap)) | 276 | (prof-map (make-sparse-keymap)) |
| @@ -356,7 +356,7 @@ | |||
| 356 | '(menu-item "Evaluate Region" eval-region | 356 | '(menu-item "Evaluate Region" eval-region |
| 357 | :help "Execute the region as Lisp code" | 357 | :help "Execute the region as Lisp code" |
| 358 | :enable mark-active)) | 358 | :enable mark-active)) |
| 359 | (define-key menu-map [eval-sexp] | 359 | (define-key menu-map [eval-sexp] |
| 360 | '(menu-item "Evaluate Last S-expression" eval-last-sexp | 360 | '(menu-item "Evaluate Last S-expression" eval-last-sexp |
| 361 | :help "Evaluate sexp before point; print value in minibuffer")) | 361 | :help "Evaluate sexp before point; print value in minibuffer")) |
| 362 | (define-key menu-map [separator-format] '("--")) | 362 | (define-key menu-map [separator-format] '("--")) |
| @@ -493,7 +493,7 @@ if that value is non-nil." | |||
| 493 | (define-key map "\e\t" 'lisp-complete-symbol) | 493 | (define-key map "\e\t" 'lisp-complete-symbol) |
| 494 | (define-key map "\n" 'eval-print-last-sexp) | 494 | (define-key map "\n" 'eval-print-last-sexp) |
| 495 | (define-key map [menu-bar lisp-interaction] (cons "Lisp-Interaction" menu-map)) | 495 | (define-key map [menu-bar lisp-interaction] (cons "Lisp-Interaction" menu-map)) |
| 496 | (define-key menu-map [eval-defun] | 496 | (define-key menu-map [eval-defun] |
| 497 | '(menu-item "Evaluate Defun" eval-defun | 497 | '(menu-item "Evaluate Defun" eval-defun |
| 498 | :help "Evaluate the top-level form containing point, or after point")) | 498 | :help "Evaluate the top-level form containing point, or after point")) |
| 499 | (define-key menu-map [eval-print-last-sexp] | 499 | (define-key menu-map [eval-print-last-sexp] |
| @@ -853,7 +853,8 @@ which see." | |||
| 853 | value))))) | 853 | value))))) |
| 854 | 854 | ||
| 855 | ;; May still be used by some external Lisp-mode variant. | 855 | ;; May still be used by some external Lisp-mode variant. |
| 856 | (define-obsolete-function-alias 'lisp-comment-indent 'comment-indent-default) | 856 | (define-obsolete-function-alias 'lisp-comment-indent |
| 857 | 'comment-indent-default "22.1") | ||
| 857 | 858 | ||
| 858 | ;; This function just forces a more costly detection of comments (using | 859 | ;; This function just forces a more costly detection of comments (using |
| 859 | ;; parse-partial-sexp from beginning-of-defun). I.e. It avoids the problem of | 860 | ;; parse-partial-sexp from beginning-of-defun). I.e. It avoids the problem of |