From e2cd29bdb4ab9ebcc99e136108f3f156577c9541 Mon Sep 17 00:00:00 2001 From: John Paul Wallington Date: Wed, 29 Jan 2003 21:45:56 +0000 Subject: [PATCH] * 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. --- lisp/ChangeLog | 17 +++++++++++++++++ lisp/custom.el | 6 +++--- lisp/emacs-lisp/lisp-mode.el | 11 ++++++----- lisp/font-lock.el | 3 ++- 4 files changed, 28 insertions(+), 9 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index dac69b4fa2e..ede4bfd1fd8 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,20 @@ +2003-01-29 John Paul Wallington + + * 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. + +2003-01-29 Didier Verna + + * cus-edit.el (custom-save-variables): also save non theme'd ones. + * cus-edit.el (custom-save-faces): ditto. + 2003-01-29 Juanma Barranquero * composite.el (decompose-composite-char): Fix docstring. diff --git a/lisp/custom.el b/lisp/custom.el index a4a496c0bef..b3458bfce41 100644 --- a/lisp/custom.el +++ b/lisp/custom.el @@ -817,7 +817,7 @@ this sets the local binding in that buffer instead." 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 @@ Return non-nil iff the `saved-value' property actually changed." 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 @@ by `custom-make-theme-feature'." (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) diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el index 46f59dd5721..60110149388 100644 --- a/lisp/emacs-lisp/lisp-mode.el +++ b/lisp/emacs-lisp/lisp-mode.el @@ -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) diff --git a/lisp/font-lock.el b/lisp/font-lock.el index 8f7d57c716c..cf47f77d40d 100644 --- a/lisp/font-lock.el +++ b/lisp/font-lock.el @@ -1793,7 +1793,7 @@ This function could be MATCHER in a MATCH-ANCHORED `font-lock-keywords' item." ;; 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 @@ The value of this variable is used when Font Lock mode is turned on." "ifndef" "include" "line" "pragma" "undef")))) (c-preprocessor-directives-depth (regexp-opt-depth c-preprocessor-directives))) + (defconst c-font-lock-keywords-1 (list ;; -- 2.39.5