aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2015-01-16 14:17:25 -0500
committerGlenn Morris2015-01-16 14:17:25 -0500
commit8db625b6056965fe52e75080950e4ee0ad98bcc6 (patch)
treeafb3cadb728fa0b172bada3f8b0707efbf24562f
parent4303d11029cf204cbf4ddf917ee0d37b08130570 (diff)
downloademacs-8db625b6056965fe52e75080950e4ee0ad98bcc6.tar.gz
emacs-8db625b6056965fe52e75080950e4ee0ad98bcc6.zip
# ChangeLog fixes
-rw-r--r--lisp/ChangeLog11
1 files changed, 3 insertions, 8 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d46726f7db7..57aaea0f4ce 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,6 +1,6 @@
12015-01-16 Jorgen Schaefer <contact@jorgenschaefer.de> 12015-01-16 Jorgen Schaefer <contact@jorgenschaefer.de>
2 2
3 * lisp/package.el: Provide repository priorities. 3 * emacs-lisp/package.el: Provide repository priorities.
4 (package-archive-priorities): New variable. 4 (package-archive-priorities): New variable.
5 (package--add-to-alist): New function. 5 (package--add-to-alist): New function.
6 (package--add-to-archive-contents): Use it. 6 (package--add-to-archive-contents): Use it.
@@ -66,27 +66,22 @@
66 66
672015-01-13 Alan Mackenzie <acm@muc.de> 672015-01-13 Alan Mackenzie <acm@muc.de>
68 68
69 Allow compilation during loading of Modes derived from a CC Mode mode. 69 Allow compilation during loading of CC Mode-derived modes (bug#19206).
70 Fixes debbugs#19206.
71
72 * progmodes/cc-bytecomp.el (cc-bytecomp-compiling-or-loading): 70 * progmodes/cc-bytecomp.el (cc-bytecomp-compiling-or-loading):
73 New function which walks the stack to discover whether we're compiling 71 New function which walks the stack to discover whether we're compiling
74 or loading. 72 or loading.
75 (cc-bytecomp-is-compiling): Reformulate, and move towards 73 (cc-bytecomp-is-compiling): Reformulate, and move towards beginning.
76 beginning.
77 (cc-bytecomp-is-loading): New defsubst. 74 (cc-bytecomp-is-loading): New defsubst.
78 (cc-bytecomp-setup-environment, cc-bytecomp-restore-environment): 75 (cc-bytecomp-setup-environment, cc-bytecomp-restore-environment):
79 Use the above defsubsts. 76 Use the above defsubsts.
80 (cc-require-when-compile, cc-bytecomp-defvar) 77 (cc-require-when-compile, cc-bytecomp-defvar)
81 (cc-bytecomp-defun): Simplify conditionals. 78 (cc-bytecomp-defun): Simplify conditionals.
82
83 * progmodes/cc-defs.el (cc-bytecomp-compiling-or-loading): 79 * progmodes/cc-defs.el (cc-bytecomp-compiling-or-loading):
84 "Borrow" this function from cc-bytecomp.el. 80 "Borrow" this function from cc-bytecomp.el.
85 (c-get-current-file): Reformulate using the above. 81 (c-get-current-file): Reformulate using the above.
86 (c-lang-defconst): Prevent duplicate entries of file names in a 82 (c-lang-defconst): Prevent duplicate entries of file names in a
87 symbol's 'source property. 83 symbol's 'source property.
88 (c-lang-const): Use cc-bytecomp-is-compiling. 84 (c-lang-const): Use cc-bytecomp-is-compiling.
89
90 * progmodes/cc-langs.el (c-make-init-lang-vars-fun): 85 * progmodes/cc-langs.el (c-make-init-lang-vars-fun):
91 Use cc-bytecomp-is-compiling. 86 Use cc-bytecomp-is-compiling.
92 87