Now on revision 112222. ------------------------------------------------------------ revno: 112222 committer: Glenn Morris branch nick: trunk timestamp: Wed 2013-04-03 20:46:25 -0700 message: ChangeLog fixes 2013-03-16 was not the date Emacs 24.3 was released, it was not even the date on which I merged all changes from that release into trunk. Ref: http://lists.gnu.org/archive/html/emacs-devel/2013-03/msg00990.html diff: === modified file 'ChangeLog' --- ChangeLog 2013-03-30 17:30:06 +0000 +++ ChangeLog 2013-04-04 03:46:25 +0000 @@ -50,6 +50,10 @@ 2013-03-11 putenv: avoid compilation warning on mingw 2013-03-11 unistd: don't prevent Tru64 Unix from using gnulib strtod. +2013-03-11 Glenn Morris + + * Merge in all changes up to version 24.3 release. + 2013-03-06 Paul Eggert * configure.ac (TERM_HEADER): Remove duplicate definition (Bug#13872). === modified file 'doc/emacs/ChangeLog' --- doc/emacs/ChangeLog 2013-03-17 22:55:13 +0000 +++ doc/emacs/ChangeLog 2013-04-04 03:46:25 +0000 @@ -13,10 +13,6 @@ * emacs.texi (Top): Add some stuff specific to www.gnu.org. -2013-03-16 Glenn Morris - - * Version 24.3 released. - 2013-03-04 Paul Eggert Prefer UTF-8 for documentation. === modified file 'doc/lispintro/ChangeLog' --- doc/lispintro/ChangeLog 2013-03-16 22:08:22 +0000 +++ doc/lispintro/ChangeLog 2013-04-04 03:46:25 +0000 @@ -2,10 +2,6 @@ * emacs-lisp-intro.texi: Add some stuff specific to www.gnu.org. -2013-03-16 Glenn Morris - - * Version 24.3 released. - 2013-03-03 Glenn Morris * emacs-lisp-intro.texi (Digression into C): Update example. === modified file 'doc/lispref/ChangeLog' --- doc/lispref/ChangeLog 2013-03-24 17:55:06 +0000 +++ doc/lispref/ChangeLog 2013-04-04 03:46:25 +0000 @@ -16,9 +16,6 @@ * elisp.texi: Add some stuff specific to www.gnu.org. -2013-03-16 Glenn Morris - - * Version 24.3 released. 2013-03-11 Teodor Zlatanov * control.texi (Pattern matching case statement): Fix typo. === modified file 'leim/ChangeLog' --- leim/ChangeLog 2013-04-02 01:18:40 +0000 +++ leim/ChangeLog 2013-04-04 03:46:25 +0000 @@ -39,10 +39,6 @@ (rules): Use tighter regexps to avoid conflicts. Consolidate the various rules for combining marks. -2013-03-16 Glenn Morris - - * Version 24.3 released. - 2013-02-08 Stefan Monnier * quail/latin-ltx.el: Add greek superscripts. === modified file 'lib-src/ChangeLog' --- lib-src/ChangeLog 2013-04-01 07:58:04 +0000 +++ lib-src/ChangeLog 2013-04-04 03:46:25 +0000 @@ -14,10 +14,6 @@ (socket_connection) [!HAVE_KRB5_ERROR_TEXT && HAVE_KRB5_ERROR_E_TEXT]: Use ERROR_MAX, not ERRMAX. -2013-03-16 Glenn Morris - - * Version 24.3 released. - 2013-03-13 Paul Eggert File synchronization fixes (Bug#13944). === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-04-04 03:42:10 +0000 +++ lisp/ChangeLog 2013-04-04 03:46:25 +0000 @@ -406,10 +406,6 @@ * thingatpt.el (end-of-sexp): Fix bug#13952. Use syntax-after. -2013-03-16 Glenn Morris - - * Version 24.3 released. - 2013-03-16 Eli Zaretskii * startup.el (command-line-normalize-file-name): Fix handling of ------------------------------------------------------------ revno: 112221 committer: Glenn Morris branch nick: trunk timestamp: Wed 2013-04-03 20:42:10 -0700 message: * lisp/electric.el (electric-pair-inhibit-predicate): Add :version. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-04-04 02:46:38 +0000 +++ lisp/ChangeLog 2013-04-04 03:42:10 +0000 @@ -1,3 +1,7 @@ +2013-04-04 Glenn Morris + + * electric.el (electric-pair-inhibit-predicate): Add :version. + 2013-04-04 Stefan Monnier * emacs-lisp/package.el (package-compute-transaction): Fix ordering === modified file 'lisp/electric.el' --- lisp/electric.el 2013-04-01 13:28:19 +0000 +++ lisp/electric.el 2013-04-04 03:42:10 +0000 @@ -308,6 +308,7 @@ The function is called with a single char (the opening char just inserted). If it returns non-nil, then `electric-pair-mode' will not insert a matching closer." + :version "24.4" :type '(choice (const :tag "Default" electric-pair-default-inhibit) (const :tag "Always pair" ignore) ------------------------------------------------------------ revno: 112220 fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=14082 committer: Stefan Monnier branch nick: trunk timestamp: Wed 2013-04-03 22:46:38 -0400 message: * lisp/emacs-lisp/package.el (package-compute-transaction): Fix ordering when a package is required several times. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-04-04 02:12:25 +0000 +++ lisp/ChangeLog 2013-04-04 02:46:38 +0000 @@ -1,3 +1,8 @@ +2013-04-04 Stefan Monnier + + * emacs-lisp/package.el (package-compute-transaction): Fix ordering + when a package is required several times (bug#14082). + 2013-04-04 Roland Winkler * faces.el (read-face-name): Behave as promised by the docstring. === modified file 'lisp/emacs-lisp/package.el' --- lisp/emacs-lisp/package.el 2013-04-04 01:51:33 +0000 +++ lisp/emacs-lisp/package.el 2013-04-04 02:46:38 +0000 @@ -811,7 +811,10 @@ (package-version-join (package-desc-vers (cdr pkg-desc))))) ;; Only add to the transaction if we don't already have it. (unless (memq next-pkg package-list) - (push next-pkg package-list)) + (setq package-list + ;; Move to front, so it gets installed early enough + ;; (bug#14082). + (cons next-pkg (delq next-pkg package-list)))) (setq package-list (package-compute-transaction package-list (package-desc-reqs ------------------------------------------------------------ revno: 112219 committer: Katsumi Yamaoka branch nick: trunk timestamp: Thu 2013-04-04 02:35:55 +0000 message: lisp/gnus/mml.el (mml-minibuffer-read-description): Use `default' insted of `initial-input' for the argument name diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2013-04-03 23:19:58 +0000 +++ lisp/gnus/ChangeLog 2013-04-04 02:35:55 +0000 @@ -1,3 +1,9 @@ +2013-04-04 Katsumi Yamaoka + + * mml.el (mml-minibuffer-read-description): Use `default' insted of + `initial-input' for the argument name. + Suggested by Stefan Monnier . + 2013-04-03 Kevin Layer (tiny change) * mml.el (mml-minibuffer-read-description): Allow passing in a prefix === modified file 'lisp/gnus/mml.el' --- lisp/gnus/mml.el 2013-04-03 23:19:58 +0000 +++ lisp/gnus/mml.el 2013-04-04 02:35:55 +0000 @@ -1212,8 +1212,8 @@ string default))) -(defun mml-minibuffer-read-description (&optional initial-input) - (let ((description (read-string "One line description: " initial-input))) +(defun mml-minibuffer-read-description (&optional default) + (let ((description (read-string "One line description: " default))) (when (string-match "\\`[ \t]*\\'" description) (setq description nil)) description)) ------------------------------------------------------------ revno: 112218 committer: Roland Winkler branch nick: trunk timestamp: Wed 2013-04-03 21:12:25 -0500 message: lisp/faces.el (read-face-name): Behave as promised by the docstring. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-04-04 01:59:09 +0000 +++ lisp/ChangeLog 2013-04-04 02:12:25 +0000 @@ -1,3 +1,9 @@ +2013-04-04 Roland Winkler + + * faces.el (read-face-name): Behave as promised by the docstring. + Assume that arg default is a list of faces. + (describe-face): Call read-face-name with list of default faces. + 2013-04-04 Thierry Volpiatto * bookmark.el: Fix deletion of bookmarks (bug#13972). === modified file 'lisp/faces.el' --- lisp/faces.el 2013-01-10 03:43:02 +0000 +++ lisp/faces.el 2013-04-04 02:12:25 +0000 @@ -935,80 +935,79 @@ The optional argument DEFAULT specifies the default face name(s) to return if the user just types RET. If its value is non-nil, -it should be a list of face names (symbols); in that case, the -default return value is the `car' of DEFAULT (if the argument +it should be a list of face names (symbols or strings); in that case, +the default return value is the `car' of DEFAULT (if the argument MULTIPLE is non-nil), or DEFAULT (if MULTIPLE is nil). See below for the meaning of MULTIPLE. If DEFAULT is nil, the list of default face names is taken from -the `read-face-name' property of the text at point, or, if that -is nil, from the `face' property of the text at point. +the symbol at point and the `read-face-name' property of the text at point, +or, if that is nil, from the `face' property of the text at point. -This function uses `completing-read-multiple' with \",\" as the -separator character. Thus, the user may enter multiple face +This function uses `completing-read-multiple' with \"[ \\t]*,[ \\t]*\" +as the separator regexp. Thus, the user may enter multiple face names, separated by commas. The optional argument MULTIPLE specifies the form of the return value. If MULTIPLE is non-nil, return a list of face names; if the user entered just one face name, the return value would be a list of one face name. Otherwise, return a single face name; if the user entered more than one face name, return only the first one." - (let ((faceprop (or (get-char-property (point) 'read-face-name) - (get-char-property (point) 'face))) - (aliasfaces nil) - (nonaliasfaces nil) - faces) - ;; Try to get a face name from the buffer. - (if (memq (intern-soft (thing-at-point 'symbol)) (face-list)) - (setq faces (list (intern-soft (thing-at-point 'symbol))))) - ;; Add the named faces that the `face' property uses. - (if (and (listp faceprop) - ;; Don't treat an attribute spec as a list of faces. - (not (keywordp (car faceprop))) - (not (memq (car faceprop) '(foreground-color background-color)))) - (dolist (f faceprop) - (if (symbolp f) - (push f faces))) - (if (symbolp faceprop) - (push faceprop faces))) - (delete-dups faces) - - ;; Build up the completion tables. + ;; Should we better not generate automagically a value for DEFAULT + ;; when `read-face-name' was called with DEFAULT being nil? + ;; Such magic is somewhat unusual for a function `read-...'. + ;; Also, one cannot skip this magic by means of a suitable + ;; value of DEFAULT. It would be cleaner to use + ;; (read-face-name prompt (face-at-point)). + (unless default + ;; Try to get a default face name from the buffer. + (let ((thing (intern-soft (thing-at-point 'symbol)))) + (if (memq thing (face-list)) + (setq default (list thing)))) + ;; Add the named faces that the `read-face-name' or `face' property uses. + (let ((faceprop (or (get-char-property (point) 'read-face-name) + (get-char-property (point) 'face)))) + (if (and (listp faceprop) + ;; Don't treat an attribute spec as a list of faces. + (not (keywordp (car faceprop))) + (not (memq (car faceprop) '(foreground-color background-color)))) + (dolist (face faceprop) + (if (symbolp face) + (push face default))) + (if (symbolp faceprop) + (push faceprop default))) + (delete-dups default))) + + ;; If we only want one, and the default is more than one, + ;; discard the unwanted ones now. + (if (and default (not multiple)) + (setq default (list (car default)))) + + (if default + (setq default (mapconcat (lambda (f) + (if (symbolp f) (symbol-name f) f)) + default ", "))) + + ;; Build up the completion tables. + (let (aliasfaces nonaliasfaces) (mapatoms (lambda (s) (if (custom-facep s) (if (get s 'face-alias) (push (symbol-name s) aliasfaces) (push (symbol-name s) nonaliasfaces))))) - ;; If we only want one, and the default is more than one, - ;; discard the unwanted ones now. - (unless multiple - (if faces - (setq faces (list (car faces))))) - (require 'crm) - (let* ((input - ;; Read the input. - (completing-read-multiple - (if (or faces default) - (format "%s (default `%s'): " prompt - (if faces (mapconcat 'symbol-name faces ",") - default)) - (format "%s: " prompt)) - (completion-table-in-turn nonaliasfaces aliasfaces) - nil t nil 'face-name-history - (if faces (mapconcat 'symbol-name faces ",")))) - ;; Canonicalize the output. - (output - (cond ((or (equal input "") (equal input '(""))) - (or faces (unless (stringp default) default))) - ((stringp input) - (mapcar 'intern (split-string input ", *" t))) - ((listp input) - (mapcar 'intern input)) - (input)))) + (let ((faces + ;; Read the faces. + (mapcar 'intern + (completing-read-multiple + (if default + (format "%s (default `%s'): " prompt default) + (format "%s: " prompt)) + (completion-table-in-turn nonaliasfaces aliasfaces) + nil t nil 'face-name-history default)))) ;; Return either a list of faces or just one face. (if multiple - output - (car output))))) + faces + (car faces))))) ;; Not defined without X, but behind window-system test. (defvar x-bitmap-file-path) @@ -1363,7 +1362,10 @@ If the optional argument FRAME is given, report on face FACE in that frame. If FRAME is t, report on the defaults for face FACE (for new frames). If FRAME is omitted or nil, use the selected frame." - (interactive (list (read-face-name "Describe face" 'default t))) + (interactive (list (read-face-name "Describe face" + (if (eq 'default (face-at-point)) + '(default)) + t))) (let* ((attrs '((:family . "Family") (:foundry . "Foundry") (:width . "Width") ------------------------------------------------------------ revno: 112217 fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=13972 author: Thierry Volpiatto committer: Stefan Monnier branch nick: trunk timestamp: Wed 2013-04-03 21:59:09 -0400 message: * lisp/bookmark.el: Fix deletion of bookmarks. (bookmark-bmenu-list): Don't toggle filenames if alist is empty. (bookmark-bmenu-execute-deletions): Only skip first line if it's the header. (bookmark-exit-hook-internal): Save even if list is empty. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-04-04 01:51:33 +0000 +++ lisp/ChangeLog 2013-04-04 01:59:09 +0000 @@ -1,3 +1,11 @@ +2013-04-04 Thierry Volpiatto + + * bookmark.el: Fix deletion of bookmarks (bug#13972). + (bookmark-bmenu-list): Don't toggle filenames if alist is empty. + (bookmark-bmenu-execute-deletions): Only skip first line if it's + the header. + (bookmark-exit-hook-internal): Save even if list is empty. + 2013-04-04 Yann Hodique (tiny change) * emacs-lisp/package.el (package-pinned-packages): New var. === modified file 'lisp/bookmark.el' --- lisp/bookmark.el 2013-03-07 22:35:47 +0000 +++ lisp/bookmark.el 2013-04-04 01:59:09 +0000 @@ -1582,8 +1582,8 @@ (if bookmark-bmenu-use-header-line (bookmark-bmenu-set-header) (forward-line bookmark-bmenu-inline-header-height)) - (if bookmark-bmenu-toggle-filenames - (bookmark-bmenu-toggle-filenames t)))) + (when (and bookmark-alist bookmark-bmenu-toggle-filenames) + (bookmark-bmenu-toggle-filenames t)))) ;;;###autoload (defalias 'list-bookmarks 'bookmark-bmenu-list) @@ -1998,7 +1998,8 @@ (progn (end-of-line) (point)))))) (o-col (current-column))) (goto-char (point-min)) - (forward-line 1) + (unless bookmark-bmenu-use-header-line + (forward-line 1)) (while (re-search-forward "^D" (point-max) t) (bookmark-delete (bookmark-bmenu-bookmark) t)) ; pass BATCH arg (bookmark-bmenu-list) @@ -2186,8 +2187,7 @@ "Save bookmark state, if necessary, at Emacs exit time. This also runs `bookmark-exit-hook'." (run-hooks 'bookmark-exit-hook) - (and bookmark-alist - (bookmark-time-to-save-p t) + (and (bookmark-time-to-save-p t) (bookmark-save))) (unless noninteractive ------------------------------------------------------------ revno: 112216 fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=14118 author: Yann Hodique committer: Stefan Monnier branch nick: trunk timestamp: Wed 2013-04-03 21:51:33 -0400 message: * lisp/emacs-lisp/package.el (package-pinned-packages): New var. (package--add-to-archive-contents): Obey it. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-04-03 17:50:39 +0000 +++ lisp/ChangeLog 2013-04-04 01:51:33 +0000 @@ -1,3 +1,8 @@ +2013-04-04 Yann Hodique (tiny change) + + * emacs-lisp/package.el (package-pinned-packages): New var. + (package--add-to-archive-contents): Obey it (bug#14118). + 2013-04-03 Alan Mackenzie Handle `parse-partial-sexp' landing inside a comment opener === modified file 'lisp/emacs-lisp/package.el' --- lisp/emacs-lisp/package.el 2013-02-13 16:02:35 +0000 +++ lisp/emacs-lisp/package.el 2013-04-04 01:51:33 +0000 @@ -4,7 +4,7 @@ ;; Author: Tom Tromey ;; Created: 10 Mar 2007 -;; Version: 1.0 +;; Version: 1.0.1 ;; Keywords: tools ;; This file is part of GNU Emacs. @@ -234,11 +234,28 @@ :group 'package :version "24.1") +(defcustom package-pinned-packages nil + "An alist of packages that are pinned to a specific archive + +Each element has the form (SYM . ID). + SYM is a package, as a symbol. + ID is an archive name, as a string. This should correspond to an + entry in `package-archives'. + +If the archive of name ID does not contain the package SYM, no +other location will be considered, which will make the +package unavailable." + :type '(alist :key-type (symbol :tag "Package") + :value-type (string :tag "Archive name")) + :risky t + :group 'package + :version "24.4") + (defconst package-archive-version 1 "Version number of the package archive understood by this file. Lower version numbers than this will probably be understood as well.") -(defconst package-el-version "1.0" +(defconst package-el-version "1.0.1" "Version of package.el.") ;; We don't prime the cache since it tends to get out of date. @@ -857,8 +874,13 @@ (version (package-desc-vers (cdr package))) (entry (cons name (vconcat (cdr package) (vector archive)))) - (existing-package (assq name package-archive-contents))) - (cond ((not existing-package) + (existing-package (assq name package-archive-contents)) + (pinned-to-archive (assoc name package-pinned-packages))) + (cond ((and pinned-to-archive + ;; If pinned to another archive, skip entirely. + (not (equal (cdr pinned-to-archive) archive))) + nil) + ((not existing-package) (add-to-list 'package-archive-contents entry)) ((version-list-< (package-desc-vers (cdr existing-package)) version) ------------------------------------------------------------ revno: 112215 author: Kevin Layer committer: Katsumi Yamaoka branch nick: trunk timestamp: Wed 2013-04-03 23:19:58 +0000 message: lisp/gnus/mml.el (mml-minibuffer-read-description): Allow passing in a prefix (used by MH-E) diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2013-04-01 22:54:32 +0000 +++ lisp/gnus/ChangeLog 2013-04-03 23:19:58 +0000 @@ -1,3 +1,8 @@ +2013-04-03 Kevin Layer (tiny change) + + * mml.el (mml-minibuffer-read-description): Allow passing in a prefix + (used by MH-E). + 2013-04-01 Andrew Cohen * nnir.el (nnir-request-update-mark): Improve mark updating in original === modified file 'lisp/gnus/mml.el' --- lisp/gnus/mml.el 2013-01-30 10:43:40 +0000 +++ lisp/gnus/mml.el 2013-04-03 23:19:58 +0000 @@ -1212,8 +1212,8 @@ string default))) -(defun mml-minibuffer-read-description () - (let ((description (read-string "One line description: "))) +(defun mml-minibuffer-read-description (&optional initial-input) + (let ((description (read-string "One line description: " initial-input))) (when (string-match "\\`[ \t]*\\'" description) (setq description nil)) description)) ------------------------------------------------------------ revno: 112214 committer: Alan Mackenzie branch nick: trunk timestamp: Wed 2013-04-03 17:50:39 +0000 message: Handle `parse-partial-sexp' landing inside a comment opener (Bug#13244). Also adapt to the new values of element 7 of a parse state. * progmodes/cc-engine.el (c-state-pp-to-literal): New optional parameter `not-in-delimiter'. Handle being inside comment opener. (c-invalidate-state-cache-1): Reckon with an extra "invalid" character in case we're typing a '*' after a '/'. (c-literal-limits): Handle the awkward "not-in-delimiter" cond arm instead by passing the parameter to c-state-pp-to-literal. * progmodes/cc-fonts.el (c-font-lock-doc-comments): New handling for elt. 7 of a parse state. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-04-02 01:18:40 +0000 +++ lisp/ChangeLog 2013-04-03 17:50:39 +0000 @@ -1,3 +1,19 @@ +2013-04-03 Alan Mackenzie + + Handle `parse-partial-sexp' landing inside a comment opener + (Bug#13244). Also adapt to the new values of element 7 of a parse + state. + + * progmodes/cc-engine.el (c-state-pp-to-literal): New optional + parameter `not-in-delimiter'. Handle being inside comment opener. + (c-invalidate-state-cache-1): Reckon with an extra "invalid" + character in case we're typing a '*' after a '/'. + (c-literal-limits): Handle the awkward "not-in-delimiter" cond arm + instead by passing the parameter to c-state-pp-to-literal. + + * progmodes/cc-fonts.el (c-font-lock-doc-comments): New handling + for elt. 7 of a parse state. + 2013-04-01 Paul Eggert Use UTF-8 for most files with non-ASCII characters (Bug#13936). === modified file 'lisp/progmodes/cc-engine.el' --- lisp/progmodes/cc-engine.el 2013-03-05 17:13:01 +0000 +++ lisp/progmodes/cc-engine.el 2013-04-03 17:50:39 +0000 @@ -2180,32 +2180,45 @@ ;; reduced by buffer changes, and increased by invocations of ;; `c-state-literal-at'. FIXME!!! -(defsubst c-state-pp-to-literal (from to) +(defsubst c-state-pp-to-literal (from to &optional not-in-delimiter) ;; Do a parse-partial-sexp from FROM to TO, returning either ;; (STATE TYPE (BEG . END)) if TO is in a literal; or ;; (STATE) otherwise, ;; where STATE is the parsing state at TO, TYPE is the type of the literal ;; (one of 'c, 'c++, 'string) and (BEG . END) is the boundaries of the literal. ;; + ;; Unless NOT-IN-DELIMITER is non-nil, when TO is inside a two-character + ;; comment opener, this is recognized as being in a comment literal. + ;; ;; Only elements 3 (in a string), 4 (in a comment), 5 (following a quote), ;; 7 (comment type) and 8 (start of comment/string) (and possibly 9) of ;; STATE are valid. (save-excursion (let ((s (parse-partial-sexp from to)) - ty) - (when (or (nth 3 s) (nth 4 s)) ; in a string or comment + ty co-st) + (cond + ((or (nth 3 s) (nth 4 s)) ; in a string or comment (setq ty (cond ((nth 3 s) 'string) - ((eq (nth 7 s) t) 'c++) + ((nth 7 s) 'c++) (t 'c))) (parse-partial-sexp (point) (point-max) - nil ; TARGETDEPTH - nil ; STOPBEFORE - s ; OLDSTATE - 'syntax-table)) ; stop at end of literal - (if ty - `(,s ,ty (,(nth 8 s) . ,(point))) - `(,s))))) + nil ; TARGETDEPTH + nil ; STOPBEFORE + s ; OLDSTATE + 'syntax-table) ; stop at end of literal + `(,s ,ty (,(nth 8 s) . ,(point)))) + + ((and (not not-in-delimiter) ; inside a comment starter + (not (bobp)) + (progn (backward-char) + (looking-at c-comment-start-regexp))) + (setq ty (if (looking-at c-block-comment-start-regexp) 'c 'c++) + co-st (point)) + (forward-comment 1) + `(,s ,ty (,co-st . ,(point)))) + + (t `(,s)))))) (defun c-state-safe-place (here) ;; Return a buffer position before HERE which is "safe", i.e. outside any @@ -3143,10 +3156,13 @@ ;; This function is called from c-after-change. ;; The caches of non-literals: - (if (< here c-state-nonlit-pos-cache-limit) - (setq c-state-nonlit-pos-cache-limit here)) - (if (< here c-state-semi-nonlit-pos-cache-limit) - (setq c-state-semi-nonlit-pos-cache-limit here)) + ;; Note that we use "<=" for the possibility of the second char of a two-char + ;; comment opener being typed; this would invalidate any cache position at + ;; HERE. + (if (<= here c-state-nonlit-pos-cache-limit) + (setq c-state-nonlit-pos-cache-limit (1- here))) + (if (<= here c-state-semi-nonlit-pos-cache-limit) + (setq c-state-semi-nonlit-pos-cache-limit (1- here))) ;; `c-state-cache': ;; Case 1: if `here' is in a literal containing point-min, everything @@ -4444,19 +4460,12 @@ (lim (or lim (c-state-semi-safe-place pos))) (pp-to-lit (save-restriction (widen) - (c-state-pp-to-literal lim pos))) + (c-state-pp-to-literal lim pos not-in-delimiter))) (state (car pp-to-lit)) (lit-limits (car (cddr pp-to-lit)))) (cond (lit-limits) - ((and (not not-in-delimiter) - (not (elt state 5)) - (eq (char-before) ?/) - (looking-at "[/*]")) ; FIXME!!! use c-line/block-comment-starter. 2008-09-28. - ;; We're standing in a comment starter. - (backward-char 1) - (cons (point) (progn (c-forward-single-comment) (point)))) (near (goto-char pos) === modified file 'lisp/progmodes/cc-fonts.el' --- lisp/progmodes/cc-fonts.el 2013-01-11 23:08:55 +0000 +++ lisp/progmodes/cc-fonts.el 2013-04-03 17:50:39 +0000 @@ -2486,7 +2486,7 @@ (setq comment-beg nil)) (setq region-beg comment-beg)) - (if (eq (elt (parse-partial-sexp comment-beg (+ comment-beg 2)) 7) t) + (if (elt (parse-partial-sexp comment-beg (+ comment-beg 2)) 7) ;; Collect a sequence of doc style line comments. (progn (goto-char comment-beg) ------------------------------------------------------------ revno: 112213 committer: Paul Eggert branch nick: trunk timestamp: Wed 2013-04-03 10:07:50 -0700 message: Spelling fix. diff: === modified file 'lisp/gnus/gnus-msg.el' --- lisp/gnus/gnus-msg.el 2013-04-01 22:54:32 +0000 +++ lisp/gnus/gnus-msg.el 2013-04-03 17:07:50 +0000 @@ -416,7 +416,7 @@ ,(gnus-group-decoded-name gnus-newsgroup-name) ',articles))) (autoload 'nnir-article-number "nnir" nil nil 'macro) -(autoload 'nnir-article-group "nnir" nil nil 'marcro) +(autoload 'nnir-article-group "nnir" nil nil 'macro) (defvar gnus-article-reply nil) ------------------------------------------------------------ revno: 112212 author: Fabrice Niessen committer: Chong Yidong branch nick: trunk timestamp: Tue 2013-04-02 11:33:31 +0800 message: * etc/themes/leuven-theme.el: Update theme. diff: === modified file 'etc/ChangeLog' --- etc/ChangeLog 2013-04-02 01:18:40 +0000 +++ etc/ChangeLog 2013-04-02 03:33:31 +0000 @@ -1,3 +1,7 @@ +2013-04-02 Fabrice Niessen + + * themes/leuven-theme.el: Update theme. + 2013-04-01 Paul Eggert Use UTF-8 for most files with non-ASCII characters (Bug#13936). === modified file 'etc/themes/leuven-theme.el' --- etc/themes/leuven-theme.el 2013-01-02 16:30:50 +0000 +++ etc/themes/leuven-theme.el 2013-04-02 03:33:31 +0000 @@ -1,7 +1,7 @@ ;;; leuven-theme.el --- Emacs custom theme ;; Copyright (C) 2003-2013 Free Software Foundation, Inc. -;; Time-stamp: <2012-12-05 Wed 10:47> +;; Time-stamp: <2013-03-14 Thu 17:04> ;; Author: Fabrice Niessen <(concat "fniessen" at-sign "pirilampo.org")> @@ -39,7 +39,7 @@ (diff-none '(:foreground "gray33")) (diff-removed '(:foreground "#A60000" :background "#FFDDDD")) (directory '(:weight bold :foreground "blue" :background "#FFFFD2")) - (highlight-line '(:inverse-video t)) + (highlight-line '(:background "#C6DBAD")) (link '(:underline t :foreground "#006DAF")) (mail-header-name '(:weight bold :foreground "black")) (marked-line '(:weight bold :foreground "white" :background "red")) @@ -57,30 +57,31 @@ (string '(:foreground "#008000")) (subject '(:weight bold :foreground "#CF5D60")) (symlink '(:foreground "deep sky blue")) + (volatile-highlight '(:background "#FFFF00")) (vc-branch '(:box (:line-width 1 :color "#00CC33") :foreground "black" :background "#AAFFAA"))) (custom-theme-set-faces 'leuven - `(default ((,class (:background "#ffffff" :foreground "#333333")))) + `(default ((,class (:background "#FFFFFF" :foreground "#333333")))) `(bold ((,class (:weight bold :foreground "black")))) `(bold-italic ((,class (:weight bold :slant italic :foreground "black")))) `(italic ((,class (:slant italic :foreground "#1A1A1A")))) `(underline ((,class (:underline t)))) - `(cursor ((,class (:background "#15ff00")))) + `(cursor ((,class (:background "#15FF00")))) ;; Highlighting faces `(fringe ((,class (:foreground "#808080" :background "#DDEEFF")))) - `(highlight ((,class (:background "#FFFF00")))) - `(region ((t ,region))) - `(secondary-selection ((t ,match))) ;; used by Org-mode for highlighting matched entries and keywords + `(highlight ((,class ,volatile-highlight))) + `(region ((,class ,region))) + `(secondary-selection ((,class ,match))) ;; used by Org-mode for highlighting matched entries and keywords `(isearch ((,class (:weight bold :foreground "#00AA00" :background "#99FF99")))) `(isearch-fail ((,class (:weight bold :foreground "black" :background "#FF9999")))) `(lazy-highlight ((,class (:weight bold :foreground "#990099" :background "#FF66FF")))) - `(trailing-whitespace ((t (:background "#F6EBFE")))) - `(whitespace-line ((t (:foreground "#CC0000" :background "#FFFF88")))) - `(whitespace-tab ((t (:foreground "lightgray" :background "beige")))) - `(whitespace-indentation ((t (:foreground "firebrick" :background "yellow")))) - `(whitespace-trailing ((t (:weight bold :foreground "yellow" :background "red1")))) - `(whitespace-hspace ((t (:background "#CCE8F6")))) + `(trailing-whitespace ((,class (:background "#F6EBFE")))) + `(whitespace-line ((,class (:foreground "#CC0000" :background "#FFFF88")))) + `(whitespace-tab ((,class (:foreground "lightgray" :background "beige")))) + `(whitespace-indentation ((,class (:foreground "firebrick" :background "yellow")))) + `(whitespace-trailing ((,class (:weight bold :foreground "yellow" :background "red1")))) + `(whitespace-hspace ((,class (:background "#CCE8F6")))) ;; Mode line faces `(mode-line ((,class (:box (:line-width 1 :color "#1A2F54") :foreground "#85CEEB" :background "#335EA8")))) `(mode-line-inactive ((,class (:box (:line-width 1 :color "#4E4E4C") :foreground "#F0F0EF" :background "#9B9C97")))) @@ -107,7 +108,7 @@ `(font-lock-reference-face ((,class (:foreground "dark cyan")))) `(font-lock-regexp-grouping-backslash ((,class (:bold t :weight bold)))) `(font-lock-regexp-grouping-construct ((,class (:bold t :weight bold)))) - `(font-lock-string-face ((t ,string))) + `(font-lock-string-face ((,class ,string))) `(font-lock-type-face ((,class (:foreground "#1B781F")))) `(font-lock-variable-name-face ((,class (:foreground "#2E91AF")))) `(font-lock-warning-face ((,class (:weight bold :foreground "red")))) @@ -135,18 +136,18 @@ `(gnus-group-mail-2 ((,class (:weight bold :foreground "#FF0066")))) `(gnus-group-mail-3-empty ((,class (:foreground "#808080")))) `(gnus-group-mail-3 ((,class (:weight bold :foreground "black")))) - `(gnus-group-mail-low-empty ((t ,cancel))) - `(gnus-group-mail-low ((t ,cancel))) + `(gnus-group-mail-low-empty ((,class ,cancel))) + `(gnus-group-mail-low ((,class ,cancel))) `(gnus-header-content ((,class (:family "Sans Serif" :foreground "#786FB4")))) `(gnus-header-from ((,class (:family "Sans Serif" :foreground "blue")))) - `(gnus-header-subject ((t ,subject))) - `(gnus-header-name ((t ,mail-header-name))) + `(gnus-header-subject ((,class ,subject))) + `(gnus-header-name ((,class ,mail-header-name))) `(gnus-header-newsgroups ((,class (:family "Sans Serif" :foreground "#3399CC")))) ;; Message faces - `(message-header-name ((t ,mail-header-name))) + `(message-header-name ((,class ,mail-header-name))) `(message-header-cc ((,class (:family "Sans Serif" :foreground "blue")))) `(message-header-other ((,class (:family "Sans Serif" :foreground "#3399CC")))) - `(message-header-subject ((t ,subject))) + `(message-header-subject ((,class ,subject))) `(message-header-to ((,class (:family "Sans Serif" :foreground "blue")))) `(message-cited-text ((,class (:foreground "#5050B0")))) `(message-separator ((,class (:family "Sans Serif" :weight bold :foreground "red")))) @@ -154,20 +155,20 @@ `(message-header-xheader ((,class (:foreground "red")))) `(message-mml ((,class (:foreground "forest green")))) ;; Diff - `(diff-added ((t ,diff-added))) + `(diff-added ((,class ,diff-added))) `(diff-changed ((,class (:foreground "blue" :background "#DDDDFF")))) - `(diff-context ((t ,diff-none))) + `(diff-context ((,class ,diff-none))) `(diff-file-header ((,class (:foreground "#0000CC" :background "#EAF2F5")))) - `(diff-file1-hunk-header ((,class (:foreground "dark magenta" :background "#EAF2F5")))) - `(diff-file2-hunk-header ((,class (:foreground "#2B7E2A" :background "#EAF2F5")))) + `(diff-file1-hunk-header ((,class (:foreground "dark magenta" :background "#EAF2F5")))) + `(diff-file2-hunk-header ((,class (:foreground "#2B7E2A" :background "#EAF2F5")))) `(diff-header ((,class (:foreground "#999999" :background "#EAF2F5")))) - `(diff-hunk-header ((t ,diff-hunk-header))) - `(diff-index ((,class (:family "Sans Serif" :height 1.1 :weight bold :foreground "#4183C4" :background "#EAF2F5")))) + `(diff-hunk-header ((,class ,diff-hunk-header))) + `(diff-index ((,class (:foreground "#4183C4" :background "#EAF2F5")))) ;; my foreground is NOT applied!? `(diff-indicator-added ((,class (:background "#AAFFAA")))) `(diff-indicator-changed ((,class (:background "#AAAAFF")))) `(diff-indicator-removed ((,class (:background "#FFAAAA")))) `(diff-refine-change ((,class (:background "#DDDDFF")))) - `(diff-removed ((t ,diff-removed))) + `(diff-removed ((,class ,diff-removed))) ;; SMerge `(smerge-refined-change ((,class (:background "#AAAAFF")))) ;; Ediff @@ -181,45 +182,44 @@ `(ediff-odd-diff-A ((,class (:foreground "black" :background "light grey")))) `(ediff-odd-diff-B ((,class (:foreground "black" :background "light grey")))) ;; Flyspell - `(flyspell-duplicate ((,class (:underline "#008000")))) - `(flyspell-incorrect ((,class (:underline "red")))) + `(flyspell-duplicate ((,class (:underline "#008000" :inherit nil)))) + `(flyspell-incorrect ((,class (:underline "red" :inherit nil)))) ;; ;; Semantic faces - ;; `(semantic-decoration-on-includes ((,class (:underline ,cham-4)))) + ;; `(semantic-decoration-on-includes ((,class (:underline ,cham-4)))) ;; `(semantic-decoration-on-private-members-face ((,class (:background ,alum-2)))) ;; `(semantic-decoration-on-protected-members-face ((,class (:background ,alum-2)))) ;; `(semantic-decoration-on-unknown-includes ((,class (:background ,choc-3)))) - ;; `(semantic-decoration-on-unparsed-includes ((,class (:underline ,orange-3)))) - ;; `(semantic-tag-boundary-face ((,class (:overline ,blue-1)))) - ;; `(semantic-unmatched-syntax-face ((,class (:underline ,red-1)))) - - `(Info-title-1-face ((t ,ol1))) - `(Info-title-2-face ((t ,ol2))) - `(Info-title-3-face ((t ,ol3))) - `(Info-title-4-face ((t ,ol4))) + ;; `(semantic-decoration-on-unparsed-includes ((,class (:underline ,orange-3)))) + ;; `(semantic-tag-boundary-face ((,class (:overline ,blue-1)))) + ;; `(semantic-unmatched-syntax-face ((,class (:underline ,red-1)))) + `(Info-title-1-face ((,class ,ol1))) + `(Info-title-2-face ((,class ,ol2))) + `(Info-title-3-face ((,class ,ol3))) + `(Info-title-4-face ((,class ,ol4))) `(bbdb-company ((,class (:slant italic :foreground "steel blue")))) `(bbdb-field-name ((,class (:weight bold :foreground "steel blue")))) `(bbdb-field-value ((,class (:foreground "steel blue")))) `(bbdb-name ((,class (:underline t :foreground "#FF6633")))) `(browse-kill-ring-separator-face ((,class (:weight bold :foreground "slate gray")))) - `(calendar-today ((,class (:weight bold :background "#CCCCFF")))) - `(cfw:face-annotation ((,class (:foreground "RosyBrown" :inherit cfw:face-day-title)))) - `(cfw:face-day-title ((,class (:background "#F8F9FF")))) + `(calendar-today ((,class (:weight bold :foreground "#4F4A3D" :background "#FFFABE")))) + `(cfw:face-annotation ((,class (:foreground "green" :background "red")))) + `(cfw:face-day-title ((,class (:foreground "#C9C9C9")))) `(cfw:face-default-content ((,class (:foreground "#2952A3")))) - `(cfw:face-default-day ((,class (:weight bold :inherit cfw:face-day-title)))) - `(cfw:face-disable ((,class (:foreground "DarkGray" :inherit cfw:face-day-title)))) - `(cfw:face-grid ((,class (:foreground "SlateBlue")))) - `(cfw:face-header ((,class (:foreground "blue" :background "#D4E5FF" :weight bold)))) - `(cfw:face-holiday ((,class (:background "#FFD5E5")))) + `(cfw:face-default-day ((,class (:weight bold)))) + `(cfw:face-disable ((,class (:foreground "DarkGray")))) + `(cfw:face-grid ((,class (:foreground "#DDDDDD")))) + `(cfw:face-header ((,class (:foreground "#1662AF" :background "white" :weight bold)))) + `(cfw:face-holiday ((,class (:foreground "#777777" :background "#E4EBFE")))) `(cfw:face-periods ((,class (:background "#668CD9" :foreground "white" :slant italic)))) - `(cfw:face-saturday ((,class (:foreground "SlateGray4" :background "gray90" :weight bold)))) - `(cfw:face-select ((,class (:background "#C3C9F8")))) - `(cfw:face-sunday ((,class (:foreground "red2" :background "#FFD5E5" :weight bold)))) - `(cfw:face-title ((,class (:foreground "DarkGrey" :weight bold :height 2.0 :inherit variable-pitch)))) - `(cfw:face-today ((,class (:background "#FFF7D7")))) - `(cfw:face-today-title ((,class (:background "#FAD163")))) - `(cfw:face-toolbar ((,class (:foreground "gray90" :background "gray90")))) - `(cfw:face-toolbar-button-off ((,class (:foreground "LightSkyBlue4" :background "white")))) - `(cfw:face-toolbar-button-on ((,class (:foreground "LightPink3" :background "gray94")))) + `(cfw:face-saturday ((,class (:foreground "#4E4E4E" :background "white" :weight bold)))) + `(cfw:face-select ((,class (:foreground "#4A95EB" :background "#EDF1FA")))) + `(cfw:face-sunday ((,class (:foreground "#4E4E4E" :background "white" :weight bold)))) + `(cfw:face-title ((,class (:foreground "#676767" :weight bold :height 2.0 :inherit variable-pitch)))) + `(cfw:face-today ((,class (:foreground "#4F4A3D" :background "#FFFABE")))) + `(cfw:face-today-title ((,class (:foreground "#4A95EB" :background "#FFFABE")))) + `(cfw:face-toolbar ((,class (:background "white")))) + `(cfw:face-toolbar-button-off ((,class (:foreground "#CFCFCF" :background "white")))) + `(cfw:face-toolbar-button-on ((,class (:foreground "#5E5E5E" :background "#F6F6F6")))) `(change-log-date-face ((,class (:foreground "purple")))) `(change-log-file ((,class (:weight bold :foreground "#4183C4")))) `(circe-highlight-all-nicks-face ((,class (:foreground "blue" :background "#F0F0F0")))) ;; other nick names @@ -228,7 +228,7 @@ `(circe-originator-face ((,class (:foreground "blue")))) `(circe-prompt-face ((,class (:foreground "red")))) `(circe-server-face ((,class (:foreground "#99CAE5")))) - `(comint-highlight-input ((t ,code-block))) + `(comint-highlight-input ((,class ,code-block))) `(comint-highlight-prompt ((,class (:foreground "#008ED1" :background "#EAEAFF")))) `(compare-windows ((,class (:background "#FFFF00")))) `(compilation-error ((,class (:weight bold :foreground "red")))) @@ -263,7 +263,7 @@ `(dircolors-face-asm ((,class (:foreground "black")))) `(dircolors-face-backup ((,class (:foreground "black")))) `(dircolors-face-compress ((,class (:foreground "red")))) - `(dircolors-face-dir ((t ,directory))) + `(dircolors-face-dir ((,class ,directory))) `(dircolors-face-doc ((,class (:foreground "black")))) `(dircolors-face-dos ((,class (:foreground "green3")))) `(dircolors-face-emacs ((,class (:foreground "black")))) @@ -281,32 +281,32 @@ `(dircolors-face-tar ((,class (:foreground "red")))) `(dircolors-face-text ((,class (:foreground "black")))) `(dircolors-face-yacc ((,class (:foreground "black")))) - `(dired-directory ((t ,directory))) - `(dired-header ((t ,directory))) + `(dired-directory ((,class ,directory))) + `(dired-header ((,class ,directory))) `(dired-ignored ((,class (:strike-through t :foreground "red")))) - `(dired-mark ((t ,marked-line))) - `(dired-marked ((t ,marked-line))) - `(dired-symlink ((t ,symlink))) + `(dired-mark ((,class ,marked-line))) + `(dired-marked ((,class ,marked-line))) + `(dired-symlink ((,class ,symlink))) `(diredp-compressed-file-suffix ((,class (:foreground "red")))) `(diredp-date-time ((,class (:foreground "purple")))) - `(diredp-dir-heading ((t ,directory))) - `(diredp-dir-priv ((t ,directory))) + `(diredp-dir-heading ((,class ,directory))) + `(diredp-dir-priv ((,class ,directory))) `(diredp-exec-priv ((,class (:background "#03C03C")))) `(diredp-executable-tag ((,class (:foreground "green3" :background "white")))) `(diredp-file-name ((,class (:foreground "black")))) `(diredp-file-suffix ((,class (:foreground "#008000")))) - `(diredp-flag-mark-line ((t ,marked-line))) + `(diredp-flag-mark-line ((,class ,marked-line))) `(diredp-ignored-file-name ((,class (:strike-through t :foreground "red")))) `(diredp-read-priv ((,class (:background "#0A99FF")))) `(diredp-write-priv ((,class (:foreground "white" :background "#FF4040")))) - `(file-name-shadow ((t ,shadow))) + `(file-name-shadow ((,class ,shadow))) `(font-latex-bold-face ((,class (:weight bold :foreground "medium sea green")))) `(font-latex-math-face ((,class (:foreground "blue")))) `(font-latex-sectioning-1-face ((,class (:family "Sans Serif" :height 2.7 :weight bold :foreground "cornflower blue")))) - `(font-latex-sectioning-2-face ((t ,ol1))) - `(font-latex-sectioning-3-face ((t ,ol2))) - `(font-latex-sectioning-4-face ((t ,ol3))) - `(font-latex-sectioning-5-face ((t ,ol4))) + `(font-latex-sectioning-2-face ((,class ,ol1))) + `(font-latex-sectioning-3-face ((,class ,ol2))) + `(font-latex-sectioning-4-face ((,class ,ol3))) + `(font-latex-sectioning-5-face ((,class ,ol4))) `(font-latex-sedate-face ((,class (:foreground "#FF5803")))) `(font-latex-string-face ((,class (:bold t :foreground "#0066FF")))) `(font-latex-verbatim-face ((,class (:foreground "tan1")))) @@ -327,7 +327,7 @@ `(gnus-picon-xbm ((,class (:foreground "yellow" :background "white")))) `(gnus-signature ((,class (:foreground "#7F7F7F")))) `(gnus-splash ((,class (:foreground "#FF8C00")))) - `(gnus-summary-cancelled ((t ,cancel))) + `(gnus-summary-cancelled ((,class ,cancel))) `(gnus-summary-high-ancient ((,class (:weight normal :foreground "#808080" :background "#FFFFE6")))) `(gnus-summary-high-read ((,class (:weight normal :foreground "#808080" :background "#FFFFE6")))) `(gnus-summary-high-ticked ((,class (:weight normal :foreground "black" :background "#E7AEB0")))) @@ -347,24 +347,24 @@ `(helm-candidate-number ((,class (:foreground "black" :background "#FFFF66")))) `(helm-dir-heading ((,class (:foreground "blue" :background "pink")))) `(helm-dir-priv ((,class (:foreground "dark red" :background "light grey")))) - `(helm-ff-directory ((t ,directory))) + `(helm-ff-directory ((,class ,directory))) `(helm-ff-executable ((,class (:foreground "green3" :background "white")))) `(helm-ff-file ((,class (:foreground "black")))) `(helm-ff-invalid-symlink ((,class (:foreground "yellow" :background "red")))) - `(helm-ff-symlink ((t ,symlink))) + `(helm-ff-symlink ((,class ,symlink))) `(helm-file-name ((,class (:foreground "blue")))) `(helm-gentoo-match-face ((,class (:foreground "red")))) `(helm-grep-running ((,class (:weight bold :foreground "white")))) `(helm-isearch-match ((,class (:background "#CCFFCC")))) - `(helm-match ((t ,match))) - `(helm-overlay-line-face ((,class (:underline t :foreground "white" :background "IndianRed4")))) - `(helm-selection ((t ,highlight-line))) + `(helm-match ((,class ,match))) + `(helm-selection ((,class ,highlight-line))) + `(helm-selection-line ((,class ,volatile-highlight))) `(helm-source-header ((,class (:family "Sans Serif" :height 1.3 :weight bold :foreground "white" :background "#666699")))) - `(helm-visible-mark ((t ,marked-line))) + `(helm-visible-mark ((,class ,marked-line))) `(helm-w3m-bookmarks-face ((,class (:underline t :foreground "cyan1")))) `(highlight-symbol-face ((,class (:background "#FFFFA0")))) - `(hl-line ((t ,highlight-line))) - `(holiday-face ((,class (:background "#B6B2AE")))) + `(hl-line ((,class ,highlight-line))) + `(holiday-face ((,class (:foreground "#777777" :background "#E4EBFE")))) `(html-helper-bold-face ((,class (:weight bold :foreground "black")))) `(html-helper-italic-face ((,class (:slant italic :foreground "black")))) `(html-helper-underline-face ((,class (:underline t :foreground "black")))) @@ -375,54 +375,54 @@ `(info-menu-header ((,class (:family "Sans Serif" :height 1.6 :weight bold :underline t :foreground "#00CC00")))) ;; menu titles (headers) -- major topics `(info-menu-star ((,class (:foreground "black")))) ;; every 3rd menu item `(info-node ((,class (:underline t :foreground "blue")))) ;; node names - `(info-quoted-name ((t ,code-inline))) - `(info-string ((t ,string))) - `(info-title-1 ((t ,ol1))) + `(info-quoted-name ((,class ,code-inline))) + `(info-string ((,class ,string))) + `(info-title-1 ((,class ,ol1))) `(info-xref ((,class (:weight bold :underline t :foreground "blue")))) ;; unvisited cross-references `(info-xref-visited ((,class (:weight bold :foreground "magenta4")))) ;; previously visited cross-references `(light-symbol-face ((,class (:background "#FFFFA0")))) `(linum ((,class (:foreground "#AFB7BA" :background "#DDEEFF")))) `(log-view-file ((,class (:foreground "#0000CC" :background "#EAF2F5")))) - `(lui-button-face ((t ,link))) + `(lui-button-face ((,class ,link))) `(lui-highlight-face ((,class (:box '(:line-width 1 :color "#CC0000") :foreground "#CC0000" :background "#FFFF88")))) ;; my nickname `(lui-time-stamp-face ((,class (:foreground "purple")))) - `(magit-branch ((t ,vc-branch))) - `(magit-diff-add ((t ,diff-added))) - `(magit-diff-del ((t ,diff-removed))) + `(magit-branch ((,class ,vc-branch))) + `(magit-diff-add ((,class ,diff-added))) + `(magit-diff-del ((,class ,diff-removed))) `(magit-diff-file-header ((,class (:family "Sans Serif" :height 1.1 :weight bold :foreground "#4183C4")))) - `(magit-diff-hunk-header ((t ,diff-hunk-header))) - `(magit-diff-none ((t ,diff-none))) + `(magit-diff-hunk-header ((,class ,diff-hunk-header))) + `(magit-diff-none ((,class ,diff-none))) `(magit-header ((,class (:foreground "white" :background "#FF4040")))) `(magit-item-highlight ((,class (:background "#EAF2F5")))) - `(magit-item-mark ((t ,marked-line))) + `(magit-item-mark ((,class ,marked-line))) `(magit-log-head-label ((,class (:box (:line-width 1 :color "blue" :style nil))))) `(magit-log-tag-label ((,class (:box (:line-width 1 :color "#00CC00" :style nil))))) `(magit-section-title ((,class (:family "Sans Serif" :height 1.8 :weight bold :foreground "cornflower blue")))) `(makefile-space-face ((,class (:background "hot pink")))) `(makefile-targets ((,class (:weight bold :foreground "blue")))) - `(match ((t ,match))) - `(mm-uu-extract ((t ,code-block))) + `(match ((,class ,match))) + `(mm-uu-extract ((,class ,code-block))) `(moccur-current-line-face ((,class (:background "#FFFFCC" :foreground "black")))) `(moccur-face ((,class (:background "#FFFF99" :foreground "black")))) `(nobreak-space ((,class (:background "#CCE8F6")))) `(nxml-attribute-local-name-face ((,class (:foreground "magenta")))) `(nxml-attribute-value-delimiter-face ((,class (:foreground "green4")))) `(nxml-attribute-value-face ((,class (:foreground "green4")))) - `(nxml-comment-content-face ((,class (:slant italic :foreground "red")))) + `(nxml-comment-content-face ((,class (:slant italic :foreground "red")))) `(nxml-comment-delimiter-face ((,class (:foreground "red")))) `(nxml-element-local-name ((,class (:box (:line-width 1 :color "#999999") :background "#DEDEDE" :foreground "#000088")))) `(nxml-element-local-name-face ((,class (:foreground "blue")))) `(nxml-processing-instruction-target-face ((,class (:foreground "purple1")))) `(nxml-tag-delimiter-face ((,class (:foreground "blue")))) `(nxml-tag-slash-face ((,class (:foreground "blue")))) - `(org-agenda-calendar-event ((,class (:weight bold :foreground "white" :background "#1662AF")))) - `(org-agenda-calendar-sexp ((,class (:foreground "black" :background "#80CBFF")))) - `(org-agenda-clocking ((t ,clock-line))) - `(org-agenda-column-dateline ((t ,column))) + `(org-agenda-calendar-event ((,class (:weight bold :foreground "#3774CC" :background "#A8C5EF")))) + `(org-agenda-calendar-sexp ((,class (:foreground "#777777" :background "#E4EBFE")))) + `(org-agenda-clocking ((,class ,clock-line))) + `(org-agenda-column-dateline ((,class ,column))) `(org-agenda-current-time ((,class (:underline t :foreground "#1662AF")))) - `(org-agenda-date ((,class (:height 1.6 :weight normal :foreground "#0063F5")))) - `(org-agenda-date-today ((,class (:height 1.6 :weight bold :foreground "#1662AF")))) - `(org-agenda-date-weekend ((,class (:height 1.6 :weight normal :foreground "dim gray")))) + `(org-agenda-date ((,class (:height 1.6 :weight bold :foreground "#1662AF")))) + `(org-agenda-date-today ((,class (:height 1.6 :weight bold :foreground "#4F4A3D" :background "#FFFABE")))) + `(org-agenda-date-weekend ((,class (:height 1.6 :weight bold :foreground "#4E4E4E")))) `(org-agenda-diary ((,class (:weight bold :foreground "green4" :background "light blue")))) `(org-agenda-dimmed-todo-face ((,class (:foreground "gold2")))) `(org-agenda-done ((,class (:foreground "#555555" :background "#EEEEEE")))) @@ -432,15 +432,15 @@ `(org-agenda-structure ((,class (:height 1.6 :weight bold :box (:line-width 1 :color "#999999") :foreground "#666666" :background "#CCCCCC")))) `(org-archived ((,class (:foreground "gray70")))) `(org-beamer-tag ((,class (:box (:line-width 1 :color "#FABC18") :foreground "#2C2C2C" :background "#FFF8D0")))) - `(org-block ((t ,code-block))) + `(org-block ((,class ,code-block))) `(org-block-background ((,class (:background "#FFFFE0")))) `(org-block-begin-line ((,class (:underline "#A7A6AA" :foreground "#555555" :background "#E2E1D5")))) `(org-block-end-line ((,class (:overline "#A7A6AA" :foreground "#555555" :background "#E2E1D5")))) `(org-checkbox ((,class (:weight bold :foreground "white" :background "#777777" :box (:line-width 1 :style pressed-button))))) `(org-clock-overlay ((,class (:foreground "white" :background "SkyBlue4")))) - `(org-code ((t ,code-inline))) - `(org-column ((t ,column))) - `(org-column-title ((t ,column))) + `(org-code ((,class (:foreground "#0066CC")))) + `(org-column ((,class ,column))) + `(org-column-title ((,class ,column))) `(org-date ((,class (:underline t :foreground "#00459E")))) `(org-default ((,class (:foreground "#333333")))) `(org-dim ((,class (:foreground "#AAAAAA")))) @@ -457,44 +457,44 @@ `(org-hide ((,class (:foreground "#E2E2E2")))) `(org-inlinetask ((,class (:box (:line-width 1 :color "#EBEBEB") :foreground "#777777" :background "#FFFFD6")))) `(org-latex-and-export-specials ((,class (:foreground "blue")))) - `(org-level-1 ((t ,ol1))) - `(org-level-2 ((t ,ol2))) - `(org-level-3 ((t ,ol3))) - `(org-level-4 ((t ,ol4))) - `(org-level-5 ((t ,ol5))) - `(org-level-6 ((t ,ol6))) - `(org-level-7 ((t ,ol7))) - `(org-level-8 ((t ,ol8))) - `(org-link ((t ,link))) + `(org-level-1 ((,class ,ol1))) + `(org-level-2 ((,class ,ol2))) + `(org-level-3 ((,class ,ol3))) + `(org-level-4 ((,class ,ol4))) + `(org-level-5 ((,class ,ol5))) + `(org-level-6 ((,class ,ol6))) + `(org-level-7 ((,class ,ol7))) + `(org-level-8 ((,class ,ol8))) + `(org-link ((,class ,link))) `(org-list-dt ((,class (:weight bold :foreground "#335EA8")))) `(org-meta-line ((,class (:slant normal :foreground "#008ED1" :background "#EAEAFF")))) - `(org-mode-line-clock ((t ,clock-line))) + `(org-mode-line-clock ((,class ,clock-line))) `(org-mode-line-clock-overrun ((,class (:weight bold :box (:line-width 1 :color "#335EA8") :foreground "white" :background "#FF4040")))) `(org-number-of-items ((,class (:weight bold :foreground "white" :background "#79BA79")))) `(org-property-value ((,class (:foreground "#00A000")))) `(org-quote ((,class (:slant italic :foreground "dim gray" :background "#FFFFE0")))) - `(org-scheduled ((,class (:slant italic :foreground "#0063DC")))) + `(org-scheduled ((,class (:foreground "#333333")))) `(org-scheduled-previously ((,class (:weight bold :foreground "#373737")))) - `(org-scheduled-today ((,class (:foreground "black" :background "#FFFFCB")))) + `(org-scheduled-today ((,class (:weight bold :foreground "#4F4A3D" :background "#FFFABE")))) `(org-sexp-date ((,class (:foreground "purple")))) `(org-special-keyword ((,class (:weight bold :foreground "#00BB00" :background "#EAFFEA")))) `(org-table ((,class (:foreground "dark green" :background "#EAFFEA")))) - `(org-tag ((,class (:height 1.0 :weight normal :slant italic :foreground "#3C424F" :background "#E5ECFA")))) + `(org-tag ((,class (:weight normal :slant italic :foreground "#3E6D8E" :background "#E0EAF1")))) `(org-target ((,class (:underline t)))) - `(org-time-grid ((,class (:foreground "#6D6D6D")))) + `(org-time-grid ((,class (:foreground "#CFCFCF")))) `(org-todo ((,class (:weight bold :box (:line-width 1 :color "#D8ABA7") :foreground "#D8ABA7" :background "#FFE6E4")))) `(org-upcoming-deadline ((,class (:foreground "#FF5555")))) `(org-verbatim ((,class (:box (:line-width 1 :color "#DDDDDD") :foreground "#000088" :background "#E0FFE0")))) `(org-verse ((,class (:slant italic :foreground "dim gray" :background "#EEEEEE")))) `(org-warning ((,class (:weight bold :foreground "black" :background "#CCE7FF")))) - `(outline-1 ((t ,ol1))) - `(outline-2 ((t ,ol2))) - `(outline-3 ((t ,ol3))) - `(outline-4 ((t ,ol4))) - `(outline-5 ((t ,ol5))) - `(outline-6 ((t ,ol6))) - `(outline-7 ((t ,ol7))) - `(outline-8 ((t ,ol8))) + `(outline-1 ((,class ,ol1))) + `(outline-2 ((,class ,ol2))) + `(outline-3 ((,class ,ol3))) + `(outline-4 ((,class ,ol4))) + `(outline-5 ((,class ,ol5))) + `(outline-6 ((,class ,ol6))) + `(outline-7 ((,class ,ol7))) + `(outline-8 ((,class ,ol8))) `(pabbrev-debug-display-label-face ((,class (:background "chartreuse")))) `(pabbrev-suggestions-face ((,class (:weight bold :foreground "white" :background "red")))) `(pabbrev-suggestions-label-face ((,class (:weight bold :foreground "white" :background "purple")))) @@ -504,7 +504,7 @@ `(pp^L-highlight ((,class (:strike-through t)))) `(recover-this-file ((,class (:background "white" :background "#FF3F3F")))) `(sh-heredoc ((,class (:foreground "blue" :background "#FBF9EA")))) - `(shadow ((t ,shadow))) + `(shadow ((,class ,shadow))) `(shell-option-face ((,class (:foreground "forest green")))) `(shell-output-2-face ((,class (:foreground "blue")))) `(shell-output-3-face ((,class (:foreground "purple")))) @@ -515,16 +515,16 @@ `(speedbar-button-face ((,class (:foreground "green4")))) `(speedbar-directory-face ((,class (:foreground "blue4")))) `(speedbar-file-face ((,class (:foreground "cyan4")))) - `(speedbar-highlight-face ((,class (:background "green")))) + `(speedbar-highlight-face ((,class ,volatile-highlight))) `(speedbar-selected-face ((,class (:underline t :foreground "red")))) `(speedbar-tag-face ((,class (:foreground "brown")))) - `(svn-status-directory-face ((t ,directory))) + `(svn-status-directory-face ((,class ,directory))) `(svn-status-filename-face ((,class (:weight bold :foreground "#4183C4")))) `(svn-status-locked-face ((,class (:weight bold :foreground "red")))) - `(svn-status-marked-face ((t ,marked-line))) + `(svn-status-marked-face ((,class ,marked-line))) `(svn-status-marked-popup-face ((,class (:weight bold :foreground "green3")))) `(svn-status-switched-face ((,class (:slant italic :foreground "gray55")))) - `(svn-status-symlink-face ((t ,symlink))) + `(svn-status-symlink-face ((,class ,symlink))) `(svn-status-update-available-face ((,class (:foreground "orange")))) `(tex-verbatim ((,class (:foreground "blue")))) `(tool-bar ((,class (:box (:line-width 1 :style released-button) :foreground "black" :background "gray75")))) @@ -549,7 +549,7 @@ `(vc-annotate-face-FF993F ((,class (:foreground "#FF993F" :background "black")))) `(vc-annotate-face-FFC63F ((,class (:foreground "#FF993F" :background "black")))) `(vc-annotate-face-FFF33F ((,class (:foreground "#FFF33F" :background "black")))) - `(w3m-anchor ((t ,link))) + `(w3m-anchor ((,class ,link))) `(w3m-arrived-anchor ((,class (:foreground "purple1")))) `(w3m-bitmap-image-face ((,class (:foreground "gray4" :background "green")))) `(w3m-bold ((,class (:weight bold :foreground "medium sea green")))) @@ -569,9 +569,9 @@ `(whitespace-hspace ((,class (:background "#CCE8F6")))) `(whitespace-indentation ((,class (:foreground "firebrick" :background "yellow")))) `(whitespace-line ((,class (:foreground "#CC0000" :background "#FFFF88")))) - `(whitespace-tab ((,class (:foreground "lightgray" :background "beige")))) + `(whitespace-tab ((,class (:foreground "lightgray" :background "beige")))) `(whitespace-trailing ((,class (:weight bold :foreground "yellow" :background "red1")))) - `(widget-button-face ((t ,link))) + `(widget-button-face ((,class ,link))) `(widget-button-pressed-face ((,class (:foreground "red")))) `(widget-documentation-face ((,class (:foreground "green4")))) `(widget-field-face ((,class (:background "gray85")))) @@ -583,8 +583,8 @@ (custom-theme-set-variables 'leuven - '(ansi-color-names-vector ["#242424" "#e5786d" "#95e454" "#cae682" - "#8ac6f2" "#333366" "#ccaa8f" "#f6f3e8"])) + '(ansi-color-names-vector ["#242424" "#E5786D" "#95E454" "#CAE682" + "#8AC6F2" "#333366" "#CCAA8F" "#F6F3E8"])) (provide-theme 'leuven)