aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Nicolaescu2009-11-06 07:50:54 +0000
committerDan Nicolaescu2009-11-06 07:50:54 +0000
commit0b7f397ca754d0fca96b9778329ec5206f445205 (patch)
tree9d4f2daf57168c04b61837cc6eeca90c364b5198
parent5adc433ec64ffbd82f809de77fceb294fc8a93c2 (diff)
downloademacs-0b7f397ca754d0fca96b9778329ec5206f445205.tar.gz
emacs-0b7f397ca754d0fca96b9778329ec5206f445205.zip
* progmodes/ld-script.el (auto-mode-alist):
* vc-hooks.el (vc-directory-exclusion-list): Purecopy strings. * cus-face.el (custom-declare-face): Purecopy face spec.
-rw-r--r--lisp/ChangeLog7
-rw-r--r--lisp/cus-face.el2
-rw-r--r--lisp/progmodes/ld-script.el7
-rw-r--r--lisp/vc-hooks.el4
4 files changed, 14 insertions, 6 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 63e9caad901..380f208b2b1 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
12009-11-05 Dan Nicolaescu <dann@ics.uci.edu>
2
3 * progmodes/ld-script.el (auto-mode-alist):
4 * vc-hooks.el (vc-directory-exclusion-list): Purecopy strings.
5
6 * cus-face.el (custom-declare-face): Purecopy face spec.
7
12009-11-06 Kenichi Handa <handa@m17n.org> 82009-11-06 Kenichi Handa <handa@m17n.org>
2 9
3 * international/uni-bidi.el: Re-generated. 10 * international/uni-bidi.el: Re-generated.
diff --git a/lisp/cus-face.el b/lisp/cus-face.el
index 78c28b058da..c28b660b31b 100644
--- a/lisp/cus-face.el
+++ b/lisp/cus-face.el
@@ -50,7 +50,7 @@
50 (if have-window-system 50 (if have-window-system
51 (make-face-x-resource-internal face))))) 51 (make-face-x-resource-internal face)))))
52 ;; Don't record SPEC until we see it causes no errors. 52 ;; Don't record SPEC until we see it causes no errors.
53 (put face 'face-defface-spec spec) 53 (put face 'face-defface-spec (purecopy spec))
54 (push (cons 'defface face) current-load-list) 54 (push (cons 'defface face) current-load-list)
55 (when (and doc (null (face-documentation face))) 55 (when (and doc (null (face-documentation face)))
56 (set-face-documentation face (purecopy doc))) 56 (set-face-documentation face (purecopy doc)))
diff --git a/lisp/progmodes/ld-script.el b/lisp/progmodes/ld-script.el
index 617a50e2004..129415eb372 100644
--- a/lisp/progmodes/ld-script.el
+++ b/lisp/progmodes/ld-script.el
@@ -162,11 +162,12 @@
162;; eCos uses "ld" and "ldi". 162;; eCos uses "ld" and "ldi".
163;; Netbsd uses "ldscript.*". 163;; Netbsd uses "ldscript.*".
164;;;###autoload 164;;;###autoload
165(add-to-list 'auto-mode-alist '("\\.ld[si]?\\>" . ld-script-mode)) 165(add-to-list 'auto-mode-alist (purecopy '("\\.ld[si]?\\>" . ld-script-mode)))
166(add-to-list 'auto-mode-alist '("ld\\.?script\\>" . ld-script-mode)) 166;;;###autoload
167(add-to-list 'auto-mode-alist (purecopy '("ld\\.?script\\>" . ld-script-mode)))
167 168
168;;;###autoload 169;;;###autoload
169(add-to-list 'auto-mode-alist '("\\.x[bdsru]?[cn]?\\'" . ld-script-mode)) 170(add-to-list 'auto-mode-alist (purecopy '("\\.x[bdsru]?[cn]?\\'" . ld-script-mode)))
170 171
171;;;###autoload 172;;;###autoload
172(define-derived-mode ld-script-mode nil "LD-Script" 173(define-derived-mode ld-script-mode nil "LD-Script"
diff --git a/lisp/vc-hooks.el b/lisp/vc-hooks.el
index e8e3d743a2a..c1336d26924 100644
--- a/lisp/vc-hooks.el
+++ b/lisp/vc-hooks.el
@@ -77,9 +77,9 @@ An empty list disables VC altogether."
77 77
78;; Note: we don't actually have a darcs back end yet. 78;; Note: we don't actually have a darcs back end yet.
79;; Also, Meta-CVS (corresponsding to MCVS) is unsupported. 79;; Also, Meta-CVS (corresponsding to MCVS) is unsupported.
80(defcustom vc-directory-exclusion-list '("SCCS" "RCS" "CVS" "MCVS" 80(defcustom vc-directory-exclusion-list (purecopy '("SCCS" "RCS" "CVS" "MCVS"
81 ".svn" ".git" ".hg" ".bzr" 81 ".svn" ".git" ".hg" ".bzr"
82 "_MTN" "_darcs" "{arch}") 82 "_MTN" "_darcs" "{arch}"))
83 "List of directory names to be ignored when walking directory trees." 83 "List of directory names to be ignored when walking directory trees."
84 :type '(repeat string) 84 :type '(repeat string)
85 :group 'vc) 85 :group 'vc)