diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/emacs-lisp/checkdoc.el | 2 | ||||
| -rw-r--r-- | lisp/help-fns.el | 2 | ||||
| -rw-r--r-- | lisp/loadhist.el | 2 | ||||
| -rw-r--r-- | lisp/progmodes/cc-mode.el | 13 | ||||
| -rw-r--r-- | lisp/progmodes/vhdl-mode.el | 2 | ||||
| -rw-r--r-- | lisp/simple.el | 13 | ||||
| -rw-r--r-- | lisp/subr.el | 25 |
7 files changed, 32 insertions, 27 deletions
diff --git a/lisp/emacs-lisp/checkdoc.el b/lisp/emacs-lisp/checkdoc.el index e15836ee7d8..fa5d1cff417 100644 --- a/lisp/emacs-lisp/checkdoc.el +++ b/lisp/emacs-lisp/checkdoc.el @@ -168,7 +168,7 @@ ;; not specifically docstring related. Would this even be useful? ;;; Code: -(defvar checkdoc-version "0.6.1" +(defvar checkdoc-version "0.6.2" "Release version of checkdoc you are currently running.") (require 'cl-lib) diff --git a/lisp/help-fns.el b/lisp/help-fns.el index ad496166f50..59eedb5331d 100644 --- a/lisp/help-fns.el +++ b/lisp/help-fns.el @@ -1000,6 +1000,8 @@ it is displayed along with the global value." (terpri) (let ((buf (current-buffer))) (with-temp-buffer + (lisp-mode-variables nil) + (set-syntax-table emacs-lisp-mode-syntax-table) (insert print-rep) (pp-buffer) (let ((pp-buffer (current-buffer))) diff --git a/lisp/loadhist.el b/lisp/loadhist.el index dabc8b9457a..a1ff2f6270d 100644 --- a/lisp/loadhist.el +++ b/lisp/loadhist.el @@ -173,7 +173,7 @@ documentation of `unload-feature' for details.") ;; we undefine it. ;; So we use this auxiliary variable to keep track of the last (t . SYMBOL) ;; that occurred. -(defvar loadhist--restore-autoload +(defvar loadhist--restore-autoload nil "If non-nil, this is a symbol for which we should restore a previous autoload if possible.") diff --git a/lisp/progmodes/cc-mode.el b/lisp/progmodes/cc-mode.el index 2a281d4d2aa..a39c50e4138 100644 --- a/lisp/progmodes/cc-mode.el +++ b/lisp/progmodes/cc-mode.el @@ -1992,17 +1992,16 @@ Note that this is a strict tail, so won't match, e.g. \"0x....\".") ;; Note: c-just-done-before-change is nil, t, or 'whole-buffer. (unless (c-called-from-text-property-change-p) - (save-restriction - (widen) - (unless c-just-done-before-change - (c-before-change (point-min) (point-max))) - (unless (eq c-just-done-before-change t) + (unless (eq c-just-done-before-change t) + (save-restriction + (widen) + (when (null c-just-done-before-change) + (c-before-change (point-min) (point-max))) (setq beg (point-min) end (point-max) old-len (- end beg) c-new-BEG (point-min) - c-new-END (point-max))) - (setq c-just-done-before-change nil))) + c-new-END (point-max))))) ;; (c-new-BEG c-new-END) will be the region to fontify. It may become ;; larger than (beg end). diff --git a/lisp/progmodes/vhdl-mode.el b/lisp/progmodes/vhdl-mode.el index 0677d36fbc7..22c61586266 100644 --- a/lisp/progmodes/vhdl-mode.el +++ b/lisp/progmodes/vhdl-mode.el @@ -13334,7 +13334,7 @@ File statistics: \"%s\"\n\ (defvar vhdl-font-lock-keywords nil "Regular expressions to highlight in VHDL Mode.") -(defvar vhdl-font-lock-keywords-0 +(defvar vhdl-font-lock-keywords-0 nil ;; set in `vhdl-font-lock-init' because dependent on user options "For consideration as a value of `vhdl-font-lock-keywords'. This does highlighting of template prompts and directives (pragmas).") diff --git a/lisp/simple.el b/lisp/simple.el index 688dbcc947b..91736a60730 100644 --- a/lisp/simple.el +++ b/lisp/simple.el @@ -75,14 +75,16 @@ value of 1 means that nothing is amalgamated.") :version "22.1") (defcustom next-error-highlight 0.5 - "Highlighting of locations in selected source buffers. + "Highlighting of locations in the selected buffer. If a number, highlight the locus in `next-error' face for the given time in seconds, or until the next command is executed. If t, highlight the locus until the next command is executed, or until some other locus replaces it. If nil, don't highlight the locus in the source buffer. If `fringe-arrow', indicate the locus by the fringe arrow -indefinitely until some other locus replaces it." +indefinitely until some other locus replaces it. +See `next-error-highlight-no-select' to customize highlighting +of the locus in non-selected buffers." :type '(choice (number :tag "Highlight for specified time") (const :tag "Semipermanent highlighting" t) (const :tag "No highlighting" nil) @@ -91,12 +93,15 @@ indefinitely until some other locus replaces it." :version "22.1") (defcustom next-error-highlight-no-select 0.5 - "Highlighting of locations in `next-error-no-select'. + "Highlighting of locations in non-selected source buffers. +Usually non-selected buffers are displayed by `next-error-no-select'. If number, highlight the locus in `next-error' face for given time in seconds. If t, highlight the locus indefinitely until some other locus replaces it. If nil, don't highlight the locus in the source buffer. If `fringe-arrow', indicate the locus by the fringe arrow -indefinitely until some other locus replaces it." +indefinitely until some other locus replaces it. +See `next-error-highlight' to customize highlighting of the locus +in the selected buffer." :type '(choice (number :tag "Highlight for specified time") (const :tag "Semipermanent highlighting" t) (const :tag "No highlighting" nil) diff --git a/lisp/subr.el b/lisp/subr.el index 96b98c6a5b3..13515ca7da1 100644 --- a/lisp/subr.el +++ b/lisp/subr.el @@ -3967,19 +3967,18 @@ the function `undo--wrap-and-run-primitive-undo'." (let ((undo--combining-change-calls t)) (if (not inhibit-modification-hooks) (run-hook-with-args 'before-change-functions beg end)) - (if (eq buffer-undo-list t) - (setq result (funcall body)) - (let (;; (inhibit-modification-hooks t) - (before-change-functions - ;; Ugly Hack: if the body uses syntax-ppss/syntax-propertize - ;; (e.g. via a regexp-search or sexp-movement trigerring - ;; on-the-fly syntax-propertize), make sure that this gets - ;; properly refreshed after subsequent changes. - (if (memq #'syntax-ppss-flush-cache before-change-functions) - '(syntax-ppss-flush-cache))) - after-change-functions) - (setq result (funcall body))) - (let ((ap-elt + (let (;; (inhibit-modification-hooks t) + (before-change-functions + ;; Ugly Hack: if the body uses syntax-ppss/syntax-propertize + ;; (e.g. via a regexp-search or sexp-movement trigerring + ;; on-the-fly syntax-propertize), make sure that this gets + ;; properly refreshed after subsequent changes. + (if (memq #'syntax-ppss-flush-cache before-change-functions) + '(syntax-ppss-flush-cache))) + after-change-functions) + (setq result (funcall body))) + (when (not (eq buffer-undo-list t)) + (let ((ap-elt (list 'apply (- end end-marker) beg |