aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2012-10-01 20:40:56 -0400
committerStefan Monnier2012-10-01 20:40:56 -0400
commitcd38666213d8badc14fb547ba1b8b9f258fd1189 (patch)
tree2b501043665a2db668ae7a915175b1cc27e6e4f0
parentfe0a74f91ab1a6662bbcbf4a19013f43b4e24d5c (diff)
downloademacs-cd38666213d8badc14fb547ba1b8b9f258fd1189.tar.gz
emacs-cd38666213d8badc14fb547ba1b8b9f258fd1189.zip
* lisp/faces.el (modeline): Remove obsolete face name.
-rw-r--r--etc/NEWS3
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/faces.el2
3 files changed, 4 insertions, 3 deletions
diff --git a/etc/NEWS b/etc/NEWS
index 50b8e793717..e90fc16227f 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -686,7 +686,7 @@ are deprecated and will be removed eventually.
686**** inactivate-current-input-method-function -> 686**** inactivate-current-input-method-function ->
687 deactivate-current-input-method-function 687 deactivate-current-input-method-function
688 688
689** Some obsolete functions and variables were removed: 689** Some obsolete functions, variables, and faces were removed:
690 690
691*** `facemenu-unlisted-faces' 691*** `facemenu-unlisted-faces'
692*** `rmail-decode-mime-charset' 692*** `rmail-decode-mime-charset'
@@ -705,6 +705,7 @@ are deprecated and will be removed eventually.
705*** `vc-ignore-vc-files' (use `vc-handled-backends' instead) 705*** `vc-ignore-vc-files' (use `vc-handled-backends' instead)
706*** `vc-master-templates' (use `vc-handled-backends' instead) 706*** `vc-master-templates' (use `vc-handled-backends' instead)
707*** `vc-checkout-carefully' 707*** `vc-checkout-carefully'
708*** `modeline'
708 709
709 710
710* Lisp changes in Emacs 24.3 711* Lisp changes in Emacs 24.3
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8d541da24ae..758453c99b3 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
12012-10-02 Stefan Monnier <monnier@iro.umontreal.ca> 12012-10-02 Stefan Monnier <monnier@iro.umontreal.ca>
2 2
3 * faces.el (modeline): Remove obsolete face name.
4
3 * vc/add-log.el (add-log-buffer-file-name-function): Demote to defvar 5 * vc/add-log.el (add-log-buffer-file-name-function): Demote to defvar
4 and give a non-nil default value. 6 and give a non-nil default value.
5 (add-change-log-entry): Simplify accordingly. 7 (add-change-log-entry): Simplify accordingly.
diff --git a/lisp/faces.el b/lisp/faces.el
index 3ee859305a5..803b7e68fc4 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -2272,8 +2272,6 @@ terminal type to a different value."
2272 :version "21.1" 2272 :version "21.1"
2273 :group 'mode-line-faces 2273 :group 'mode-line-faces
2274 :group 'basic-faces) 2274 :group 'basic-faces)
2275;; No need to define aliases of this form for new faces.
2276(define-obsolete-face-alias 'modeline 'mode-line "21.1")
2277 2275
2278(defface mode-line-inactive 2276(defface mode-line-inactive
2279 '((default 2277 '((default