Mercurial > emacs
changeset 49522:4dd5da1ea3dc
* font-lock.el (lisp-font-lock-keywords-1): Match `deftheme'.
* emacs-lisp/lisp-mode.el (toplevel): Define docstring offset for
`deftheme'. Fix docstring offsets for `define-ibuffer-filter' and
`define-ibuffer-sorter'.
(lisp-imenu-generic-expression): Add `deftheme' to types.
* custom.el (customize-mark-to-save, customize-mark-as-set)
(custom-remove-theme): Doc fixes.
| author | John Paul Wallington <jpw@pobox.com> |
|---|---|
| date | Wed, 29 Jan 2003 21:45:07 +0000 |
| parents | c259d8177692 |
| children | 99039fabec00 |
| files | lisp/custom.el lisp/emacs-lisp/lisp-mode.el lisp/font-lock.el |
| diffstat | 3 files changed, 11 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/custom.el Wed Jan 29 21:44:18 2003 +0000 +++ b/lisp/custom.el Wed Jan 29 21:45:07 2003 +0000 @@ -817,7 +817,7 @@ If the default value of SYMBOL is different from the standard value, set the `saved-value' property to a list whose car evaluates to the -default value. Otherwise, set it til nil. +default value. Otherwise, set it to nil. To actually save the value, call `custom-save-all'. @@ -847,7 +847,7 @@ If the default value of SYMBOL is different from the saved value if any, or else if it is different from the standard value, set the `customized-value' property to a list whose car evaluates to the -default value. Otherwise, set it til nil. +default value. Otherwise, set it to nil. Return non-nil iff the `customized-value' property actually changed." (let* ((get (or (get symbol 'custom-get) 'default-value)) @@ -896,7 +896,7 @@ (custom-make-theme-feature theme)))) (defun custom-remove-theme (spec-alist theme) - "Detelete all elements from SPEC-ALIST whose car is THEME." + "Delete all elements from SPEC-ALIST whose car is THEME." (let ((elt (assoc theme spec-alist))) (while elt (setq spec-alist (delete elt spec-alist)
--- a/lisp/emacs-lisp/lisp-mode.el Wed Jan 29 21:44:18 2003 +0000 +++ b/lisp/emacs-lisp/lisp-mode.el Wed Jan 29 21:45:07 2003 +0000 @@ -107,9 +107,9 @@ (purecopy (concat "^\\s-*(" (eval-when-compile (regexp-opt - '("defgroup" "deftype" "defstruct" "defclass" - "define-condition" "define-widget" "defface" - "defpackage") t)) + '("defgroup" "deftheme" "deftype" "defstruct" + "defclass" "define-condition" "define-widget" + "defface" "defpackage") t)) "\\s-+'?\\(\\sw\\(\\sw\\|\\s_\\)+\\)")) 2)) @@ -121,6 +121,7 @@ (put 'defun* 'doc-string-elt 3) (put 'defvar 'doc-string-elt 3) (put 'defcustom 'doc-string-elt 3) +(put 'deftheme 'doc-string-elt 2) (put 'defconst 'doc-string-elt 3) (put 'defmacro 'doc-string-elt 3) (put 'defmacro* 'doc-string-elt 3) @@ -132,9 +133,9 @@ (put 'define-generic-mode 'doc-string-elt 7) ;; define-global-mode has no explicit docstring. (put 'easy-mmode-define-global-mode 'doc-string-elt 0) -(put 'define-ibuffer-filter 'doc-string-elt 3) +(put 'define-ibuffer-filter 'doc-string-elt 2) (put 'define-ibuffer-op 'doc-string-elt 3) -(put 'define-ibuffer-sorter 'doc-string-elt 3) +(put 'define-ibuffer-sorter 'doc-string-elt 2) (defun lisp-font-lock-syntactic-face-function (state) (if (nth 3 state)
--- a/lisp/font-lock.el Wed Jan 29 21:44:18 2003 +0000 +++ b/lisp/font-lock.el Wed Jan 29 21:45:07 2003 +0000 @@ -1793,7 +1793,7 @@ ;; Variable declarations. "\\(const\\(ant\\)?\\|custom\\|face\\|parameter\\|var\\)\\|" ;; Structure declarations. - "\\(class\\|group\\|package\\|struct\\|type\\)" + "\\(class\\|group\\|theme\\|package\\|struct\\|type\\)" "\\)\\)\\>" ;; Any whitespace and defined object. "[ \t'\(]*" @@ -2003,6 +2003,7 @@ "ifndef" "include" "line" "pragma" "undef")))) (c-preprocessor-directives-depth (regexp-opt-depth c-preprocessor-directives))) + (defconst c-font-lock-keywords-1 (list ;;