diff options
Diffstat (limited to 'lisp/emacs-lisp')
| -rw-r--r-- | lisp/emacs-lisp/byte-run.el | 3 | ||||
| -rw-r--r-- | lisp/emacs-lisp/derived.el | 10 | ||||
| -rw-r--r-- | lisp/emacs-lisp/lisp-mode.el | 12 |
3 files changed, 13 insertions, 12 deletions
diff --git a/lisp/emacs-lisp/byte-run.el b/lisp/emacs-lisp/byte-run.el index 7453eb235b3..a00fdf0e4f5 100644 --- a/lisp/emacs-lisp/byte-run.el +++ b/lisp/emacs-lisp/byte-run.el @@ -127,7 +127,8 @@ was first made obsolete, for example a date or a release number." (if (eq 'byte-compile-obsolete handler) (setq handler (nth 1 (get obsolete-name 'byte-obsolete-info))) (put obsolete-name 'byte-compile 'byte-compile-obsolete)) - (put obsolete-name 'byte-obsolete-info (list current-name handler (purecopy when)))) + (put obsolete-name 'byte-obsolete-info + (list (purecopy current-name) handler (purecopy when)))) obsolete-name) (set-advertised-calling-convention ;; New code should always provide the `when' argument. diff --git a/lisp/emacs-lisp/derived.el b/lisp/emacs-lisp/derived.el index ef30d7ca33f..1575d09eaa9 100644 --- a/lisp/emacs-lisp/derived.el +++ b/lisp/emacs-lisp/derived.el @@ -195,16 +195,16 @@ See Info node `(elisp)Derived Modes' for more details." `(progn (unless (get ',hook 'variable-documentation) (put ',hook 'variable-documentation - ,(format "Hook run when entering %s mode. + (purecopy ,(format "Hook run when entering %s mode. No problems result if this variable is not bound. `add-hook' automatically binds it. (This is true for all hook variables.)" - name))) + name)))) (unless (boundp ',map) (put ',map 'definition-name ',child)) (defvar ,map (make-sparse-keymap)) (unless (get ',map 'variable-documentation) (put ',map 'variable-documentation - ,(format "Keymap for `%s'." child))) + (purecopy ,(format "Keymap for `%s'." child)))) ,(if declare-syntax `(progn (unless (boundp ',syntax) @@ -212,7 +212,7 @@ No problems result if this variable is not bound. (defvar ,syntax (make-syntax-table)) (unless (get ',syntax 'variable-documentation) (put ',syntax 'variable-documentation - ,(format "Syntax table for `%s'." child))))) + (purecopy ,(format "Syntax table for `%s'." child)))))) ,(if declare-abbrev `(progn (put ',abbrev 'definition-name ',child) @@ -220,7 +220,7 @@ No problems result if this variable is not bound. (progn (define-abbrev-table ',abbrev nil) ,abbrev)) (unless (get ',abbrev 'variable-documentation) (put ',abbrev 'variable-documentation - ,(format "Abbrev table for `%s'." child))))) + (purecopy ,(format "Abbrev table for `%s'." child)))))) (put ',child 'derived-mode-parent ',parent) ,(if group `(put ',child 'custom-mode-group ,group)) diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el index 7e813278c7a..f4f2f621664 100644 --- a/lisp/emacs-lisp/lisp-mode.el +++ b/lisp/emacs-lisp/lisp-mode.el @@ -283,7 +283,7 @@ font-lock keywords will not be case sensitive." (define-key map "\e\t" 'lisp-complete-symbol) (define-key map "\e\C-x" 'eval-defun) (define-key map "\e\C-q" 'indent-pp-sexp) - (define-key map [menu-bar emacs-lisp] (cons "Emacs-Lisp" menu-map)) + (define-key map [menu-bar emacs-lisp] (cons (purecopy "Emacs-Lisp") menu-map)) (define-key menu-map [eldoc] `(menu-item ,(purecopy "Auto-Display Documentation Strings") eldoc-mode :button (:toggle . (bound-and-true-p eldoc-mode)) @@ -294,7 +294,7 @@ font-lock keywords will not be case sensitive." (define-key menu-map [re-builder] `(menu-item ,(purecopy "Construct Regexp") re-builder :help ,(purecopy "Construct a regexp interactively"))) - (define-key menu-map [tracing] (cons "Tracing" tracing-map)) + (define-key menu-map [tracing] (cons (purecopy "Tracing") tracing-map)) (define-key tracing-map [tr-a] `(menu-item ,(purecopy "Untrace all") untrace-all :help ,(purecopy "Untrace all currently traced functions"))) @@ -308,7 +308,7 @@ font-lock keywords will not be case sensitive." (define-key tracing-map [tr-f] `(menu-item ,(purecopy "Trace function...") trace-function :help ,(purecopy "Trace the function given as an argument"))) - (define-key menu-map [profiling] (cons "Profiling" prof-map)) + (define-key menu-map [profiling] (cons (purecopy "Profiling") prof-map)) (define-key prof-map [prof-restall] `(menu-item ,(purecopy "Remove Instrumentation for All Functions") elp-restore-all :help ,(purecopy "Restore the original definitions of all functions being profiled"))) @@ -332,7 +332,7 @@ font-lock keywords will not be case sensitive." (define-key prof-map [prof-func] `(menu-item ,(purecopy "Instrument Function...") elp-instrument-function :help ,(purecopy "Instrument a function for profiling"))) - (define-key menu-map [lint] (cons "Linting" lint-map)) + (define-key menu-map [lint] (cons (purecopy "Linting") lint-map)) (define-key lint-map [lint-di] `(menu-item ,(purecopy "Lint Directory...") elint-directory :help ,(purecopy "Lint a directory"))) @@ -456,7 +456,7 @@ if that value is non-nil." (set-keymap-parent map lisp-mode-shared-map) (define-key map "\e\C-x" 'lisp-eval-defun) (define-key map "\C-c\C-z" 'run-lisp) - (define-key map [menu-bar lisp] (cons "Lisp" menu-map)) + (define-key map [menu-bar lisp] (cons (purecopy "Lisp") menu-map)) (define-key menu-map [run-lisp] `(menu-item ,(purecopy "Run inferior Lisp") run-lisp :help ,(purecopy "Run an inferior Lisp process, input and output via buffer `*inferior-lisp*'"))) @@ -520,7 +520,7 @@ if that value is non-nil." (define-key map "\e\C-q" 'indent-pp-sexp) (define-key map "\e\t" 'lisp-complete-symbol) (define-key map "\n" 'eval-print-last-sexp) - (define-key map [menu-bar lisp-interaction] (cons "Lisp-Interaction" menu-map)) + (define-key map [menu-bar lisp-interaction] (cons (purecopy "Lisp-Interaction") menu-map)) (define-key menu-map [eval-defun] `(menu-item ,(purecopy "Evaluate Defun") eval-defun :help ,(purecopy "Evaluate the top-level form containing point, or after point"))) |