From aaa448c984ad227585dac4a2fe2ee5bdc467e25e Mon Sep 17 00:00:00 2001 From: Dan Nicolaescu Date: Wed, 11 Nov 2009 19:24:20 +0000 Subject: [PATCH] * widget.el (define-widget): Purecopy the docstring. * international/mule-cmds.el (charset): Do not purecopy the docstring here, define-widget does it. * textmodes/texinfo.el (texinfo-open-quote, texinfo-close-quote): * textmodes/bibtex-style.el (auto-mode-alist): * progmodes/inf-lisp.el (inferior-lisp-prompt): * progmodes/compile.el (compile-command): * language/korea-util.el (default-korean-keyboard): * international/mule-conf.el (file-coding-system-alist): * emacs-lisp/eldoc.el (eldoc-minor-mode-string): * tooltip.el (tooltip-frame-parameters): * newcomment.el (comment-end, comment-padding): * dired.el (dired-trivial-filenames): * comint.el (comint-file-name-prefix): Purecopy initial values. --- lisp/ChangeLog | 18 ++++++++++++++++++ lisp/comint.el | 2 +- lisp/dired.el | 2 +- lisp/emacs-lisp/eldoc.el | 2 +- lisp/international/mule-cmds.el | 2 +- lisp/international/mule-conf.el | 3 ++- lisp/language/korea-util.el | 4 ++-- lisp/newcomment.el | 4 ++-- lisp/progmodes/compile.el | 2 +- lisp/progmodes/inf-lisp.el | 2 +- lisp/textmodes/bibtex-style.el | 2 +- lisp/textmodes/texinfo.el | 4 ++-- lisp/tooltip.el | 2 +- lisp/widget.el | 2 +- 14 files changed, 35 insertions(+), 16 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 00a1bc00812..7a1c5082641 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,21 @@ +2009-11-11 Dan Nicolaescu + + * widget.el (define-widget): Purecopy the docstring. + * international/mule-cmds.el (charset): Do not purecopy the + docstring here, define-widget does it. + + * textmodes/texinfo.el (texinfo-open-quote, texinfo-close-quote): + * textmodes/bibtex-style.el (auto-mode-alist): + * progmodes/inf-lisp.el (inferior-lisp-prompt): + * progmodes/compile.el (compile-command): + * language/korea-util.el (default-korean-keyboard): + * international/mule-conf.el (file-coding-system-alist): + * emacs-lisp/eldoc.el (eldoc-minor-mode-string): + * tooltip.el (tooltip-frame-parameters): + * newcomment.el (comment-end, comment-padding): + * dired.el (dired-trivial-filenames): + * comint.el (comint-file-name-prefix): Purecopy initial values. + 2009-11-11 Michael Albinus * net/tramp.el (tramp-advice-minibuffer-electric-separator) diff --git a/lisp/comint.el b/lisp/comint.el index 5fd6d8f23a9..37fddc5404e 100644 --- a/lisp/comint.el +++ b/lisp/comint.el @@ -2669,7 +2669,7 @@ Note that this applies to `comint-dynamic-complete-filename' only." :group 'comint-completion) ;;;###autoload -(defvar comint-file-name-prefix "" +(defvar comint-file-name-prefix (purecopy "") "Prefix prepended to absolute file names taken from process input. This is used by Comint's and shell's completion functions, and by shell's directory tracking functions.") diff --git a/lisp/dired.el b/lisp/dired.el index 58c29a152b7..9e2c65c5c47 100644 --- a/lisp/dired.el +++ b/lisp/dired.el @@ -105,7 +105,7 @@ always set this variable to t." :group 'dired-mark) ;;;###autoload -(defcustom dired-trivial-filenames "^\\.\\.?$\\|^#" +(defcustom dired-trivial-filenames (purecopy "^\\.\\.?$\\|^#") "Regexp of files to skip when finding first file of a directory. A value of nil means move to the subdir line. A value of t means move to first file." diff --git a/lisp/emacs-lisp/eldoc.el b/lisp/emacs-lisp/eldoc.el index f1a92035bb9..2f40d5784b5 100644 --- a/lisp/emacs-lisp/eldoc.el +++ b/lisp/emacs-lisp/eldoc.el @@ -64,7 +64,7 @@ If this variable is set to 0, no idle time is required." :group 'eldoc) ;;;###autoload -(defcustom eldoc-minor-mode-string " ElDoc" +(defcustom eldoc-minor-mode-string (purecopy " ElDoc") "String to display in mode line when ElDoc Mode is enabled; nil for none." :type '(choice string (const :tag "None" nil)) :group 'eldoc) diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el index a9b94e8ded2..ad1e3b7f538 100644 --- a/lisp/international/mule-cmds.el +++ b/lisp/international/mule-cmds.el @@ -1870,7 +1870,7 @@ specifies the character set for the major languages of Western Europe." (force-mode-line-update t)) (define-widget 'charset 'symbol - (purecopy "An Emacs charset.") + "An Emacs charset." :tag "Charset" :complete-function (lambda () (interactive) diff --git a/lisp/international/mule-conf.el b/lisp/international/mule-conf.el index b32f8a93f7a..e0c1dede211 100644 --- a/lisp/international/mule-conf.el +++ b/lisp/international/mule-conf.el @@ -1504,6 +1504,7 @@ for decoding and encoding files, process I/O, etc." ;; Tar files are not decoded at all, but we treat them as raw bytes. (setq file-coding-system-alist + (mapcar (lambda (arg) (cons (purecopy (car arg)) (cdr arg))) '(("\\.elc\\'" . utf-8-emacs) ("\\.utf\\(-8\\)?\\'" . utf-8) ("\\.xml\\'" . xml-find-file-coding-system) @@ -1516,7 +1517,7 @@ for decoding and encoding files, process I/O, etc." ("\\.tar\\'" . (no-conversion . no-conversion)) ( "\\.po[tx]?\\'\\|\\.po\\." . po-find-file-coding-system) ("\\.\\(tex\\|ltx\\|dtx\\|drv\\)\\'" . latexenc-find-file-coding-system) - ("" . (undecided . nil)))) + ("" . (undecided . nil))))) ;;; Setting coding categories and their priorities. diff --git a/lisp/language/korea-util.el b/lisp/language/korea-util.el index 8f653194f66..4755a781ade 100644 --- a/lisp/language/korea-util.el +++ b/lisp/language/korea-util.el @@ -30,9 +30,9 @@ ;;;###autoload (defvar default-korean-keyboard - (if (string-match "3" (or (getenv "HANGUL_KEYBOARD_TYPE") "")) + (purecopy (if (string-match "3" (or (getenv "HANGUL_KEYBOARD_TYPE") "")) "3" - "") + "")) "*The kind of Korean keyboard for Korean input method. \"\" for 2, \"3\" for 3.") diff --git a/lisp/newcomment.el b/lisp/newcomment.el index e1c257ccc54..84b87593f86 100644 --- a/lisp/newcomment.el +++ b/lisp/newcomment.el @@ -122,7 +122,7 @@ at the place matched by the close of the first pair.") ;;;###autoload(put 'comment-end-skip 'safe-local-variable 'string-or-null-p) ;;;###autoload -(defvar comment-end "" +(defvar comment-end (purecopy "") "*String to insert to end a new comment. Should be an empty string if comments are terminated by end-of-line.") ;;;###autoload(put 'comment-end 'safe-local-variable 'string-or-null-p) @@ -218,7 +218,7 @@ See `comment-styles' for a list of available styles." :group 'comment) ;;;###autoload -(defcustom comment-padding " " +(defcustom comment-padding (purecopy " ") "Padding string that `comment-region' puts between comment chars and text. Can also be an integer which will be automatically turned into a string of the corresponding number of spaces. diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el index 91bfcf01bee..f101fe65064 100644 --- a/lisp/progmodes/compile.el +++ b/lisp/progmodes/compile.el @@ -588,7 +588,7 @@ The value nil as an element means to try the default directory." :group 'compilation) ;;;###autoload -(defcustom compile-command "make -k " +(defcustom compile-command (purecopy "make -k ") "Last shell command used to do a compilation; default for next compilation. Sometimes it is useful for files to supply local values for this variable. diff --git a/lisp/progmodes/inf-lisp.el b/lisp/progmodes/inf-lisp.el index e19da49a223..bb07642bcea 100644 --- a/lisp/progmodes/inf-lisp.el +++ b/lisp/progmodes/inf-lisp.el @@ -159,7 +159,7 @@ but it works only in Common Lisp." :group 'inferior-lisp) ;;;###autoload -(defcustom inferior-lisp-prompt "^[^> \n]*>+:? *" +(defcustom inferior-lisp-prompt (purecopy "^[^> \n]*>+:? *") "Regexp to recognize prompts in the Inferior Lisp mode. Defaults to \"^[^> \\n]*>+:? *\", which works pretty good for Lucid, kcl, and franz. This variable is used to initialize `comint-prompt-regexp' in the diff --git a/lisp/textmodes/bibtex-style.el b/lisp/textmodes/bibtex-style.el index ef5dd38e3bf..6f67d11d78e 100644 --- a/lisp/textmodes/bibtex-style.el +++ b/lisp/textmodes/bibtex-style.el @@ -63,7 +63,7 @@ ("\\<\\(FUNCTION\\|MACRO\\)\\s-+{\\([^}\n]+\\)}" (2 font-lock-function-name-face)))) -;;;###autoload (add-to-list 'auto-mode-alist '("\\.bst\\'" . bibtex-style-mode)) +;;;###autoload (add-to-list 'auto-mode-alist (cons (purecopy "\\.bst\\'") 'bibtex-style-mode)) ;;;###autoload (define-derived-mode bibtex-style-mode nil "BibStyle" diff --git a/lisp/textmodes/texinfo.el b/lisp/textmodes/texinfo.el index d7098639ae5..6b32c165d82 100644 --- a/lisp/textmodes/texinfo.el +++ b/lisp/textmodes/texinfo.el @@ -42,13 +42,13 @@ :group 'docs) ;;;###autoload -(defcustom texinfo-open-quote "``" +(defcustom texinfo-open-quote (purecopy "``") "String inserted by typing \\[texinfo-insert-quote] to open a quotation." :type 'string :group 'texinfo) ;;;###autoload -(defcustom texinfo-close-quote "''" +(defcustom texinfo-close-quote (purecopy "''") "String inserted by typing \\[texinfo-insert-quote] to close a quotation." :type 'string :group 'texinfo) diff --git a/lisp/tooltip.el b/lisp/tooltip.el index 49ecaffd0e6..dceea337851 100644 --- a/lisp/tooltip.el +++ b/lisp/tooltip.el @@ -115,7 +115,7 @@ the value of `tooltip-y-offset' is ignored." :group 'tooltip) (defcustom tooltip-frame-parameters - '((name . "tooltip") + `((name . (purecopy "tooltip")) (internal-border-width . 2) (border-width . 1)) "Frame parameters used for tooltips. diff --git a/lisp/widget.el b/lisp/widget.el index 2614995331d..d8b55a1bfb3 100644 --- a/lisp/widget.el +++ b/lisp/widget.el @@ -85,7 +85,7 @@ create identical widgets: The third argument DOC is a documentation string for the widget." (put name 'widget-type (cons class args)) - (put name 'widget-documentation doc) + (put name 'widget-documentation (purecopy doc)) name) ;; This is used by external widget code (in W3, at least). -- 2.11.4.GIT