commit 51c816b9aaff3d4c3b130d35d2ed7827c3e6e5fc (HEAD, refs/remotes/origin/master) Author: Michael Albinus Date: Wed May 11 10:12:26 2016 +0200 Fix a problem of tramp-tests on hydra. * test/lisp/net/tramp-tests.el (tramp-test06-directory-file-name): Nullify `tramp-default-method' due to hydra. diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el index 0f40468..2238da5 100644 --- a/test/lisp/net/tramp-tests.el +++ b/test/lisp/net/tramp-tests.el @@ -642,7 +642,10 @@ This checks also `file-name-as-directory', `file-name-directory', (unwind-protect ;; Bug#10085. (dolist (n-e '(nil t)) - (let ((non-essential n-e)) + ;; We must clear `tramp-default-method'. On hydra, it is "ftp", + ;; which ruins the tests. + (let ((non-essential n-e) + tramp-default-method) (when (getenv "NIX_STORE") (dolist (elt (all-completions "tramp-" obarray 'functionp)) (trace-function-background (intern elt)))) @@ -2327,6 +2330,7 @@ Since it unloads Tramp, it shall be the last test to run." ;; * set-file-selinux-context ;; * Work on skipped tests. Make a comment, when it is impossible. +;; * Fix `tramp-test06-directory-file-name' for `ftp'. ;; * Fix `tramp-test15-copy-directory' for `smb'. Using tar in a pipe ;; doesn't work well when an interactive password must be provided. ;; * Fix `tramp-test27-start-file-process' on MS Windows (`process-send-eof'?). commit 62d7acae7405732268713006d839a5c3507b9482 Author: Paul Eggert Date: Tue May 10 13:40:17 2016 -0700 Pacify byte-compiler in lisp/vc * lisp/vc/vc-bzr.el, lisp/vc/vc-cvs.el, lisp/vc/vc-hg.el: * lisp/vc/vc-rcs.el, lisp/vc/vc-src.el: Declare functions defined elsewhere, to forestall “might not be defined at runtime” warnings. diff --git a/lisp/vc/vc-bzr.el b/lisp/vc/vc-bzr.el index 03c134a..4bcab66 100644 --- a/lisp/vc/vc-bzr.el +++ b/lisp/vc/vc-bzr.el @@ -50,6 +50,11 @@ (require 'vc-dispatcher) (require 'vc-dir)) ; vc-dir-at-event +(declare-function vc-deduce-fileset "vc" + (&optional observer allow-unregistered + state-model-only-files)) + + ;; Clear up the cache to force vc-call to check again and discover ;; new functions when we reload this file. (put 'Bzr 'vc-functions nil) diff --git a/lisp/vc/vc-cvs.el b/lisp/vc/vc-cvs.el index 2dca708..dfe6b29 100644 --- a/lisp/vc/vc-cvs.el +++ b/lisp/vc/vc-cvs.el @@ -27,6 +27,12 @@ (eval-when-compile (require 'vc)) +(declare-function vc-branch-p "vc" (rev)) +(declare-function vc-checkout "vc" (file &optional rev)) +(declare-function vc-expand-dirs "vc" (file-or-dir-list backend)) +(declare-function vc-read-revision "vc" + (prompt &optional files backend default initial-input)) + ;; Clear up the cache to force vc-call to check again and discover ;; new functions when we reload this file. (put 'CVS 'vc-functions nil) diff --git a/lisp/vc/vc-hg.el b/lisp/vc/vc-hg.el index 5fb93bc..78ff56c 100644 --- a/lisp/vc/vc-hg.el +++ b/lisp/vc/vc-hg.el @@ -106,6 +106,8 @@ (require 'vc) (require 'vc-dir)) +(declare-function vc-compilation-mode "vc-dispatcher" (backend)) + ;;; Customization options (defgroup vc-hg nil diff --git a/lisp/vc/vc-rcs.el b/lisp/vc/vc-rcs.el index b972956..fcb1849 100644 --- a/lisp/vc/vc-rcs.el +++ b/lisp/vc/vc-rcs.el @@ -41,6 +41,13 @@ (require 'cl-lib) (require 'vc)) +(declare-function vc-branch-p "vc" (rev)) +(declare-function vc-read-revision "vc" + (prompt &optional files backend default initial-input)) +(declare-function vc-buffer-context "vc-dispatcher" ()) +(declare-function vc-restore-buffer-context "vc-dispatcher" (context)) +(declare-function vc-setup-buffer "vc-dispatcher" (buf)) + (defgroup vc-rcs nil "VC RCS backend." :version "24.1" diff --git a/lisp/vc/vc-src.el b/lisp/vc/vc-src.el index 2329042..8b82b56 100644 --- a/lisp/vc/vc-src.el +++ b/lisp/vc/vc-src.el @@ -85,6 +85,8 @@ (require 'cl-lib) (require 'vc)) +(declare-function vc-setup-buffer "vc-dispatcher" (buf)) + (defgroup vc-src nil "VC SRC backend." :version "25.1" commit 9e6302cfc8cc438f34a2c9765a7d48db2aec4e1c Merge: 6d0703a fc8a4e0 Author: Paul Eggert Date: Tue May 10 07:44:29 2016 -0700 ; Merge from origin/emacs-25 The following commit was skipped: fc8a4e0 ; Auto-commit of loaddefs files. commit 6d0703a01df1ece3fd9ba2a927913d1bcf10d549 Merge: 433d366 d0d9f55 Author: Paul Eggert Date: Tue May 10 07:44:28 2016 -0700 Merge from origin/emacs-25 d0d9f55 Allow newlines inside cl function arglists 963541a Publicize cl--generic-all-functions 3c581d5 ; Fix typo e58f900 Add some "safe-local-variable" declarations for compatibility... commit 433d366dc7b053048abf710d790ff62421dd1570 Author: Paul Eggert Date: Tue May 10 07:38:23 2016 -0700 'text-quoting-style' now affects only ` and ' Change 'text-quoting-style' so that it no longer affects formatting of curved quotes in format arguments to functions like 'message'. In particular, when this variable's value is 'grave', all quotes in formats are output as-is. * doc/lispref/help.texi (Keys in Documentation): * doc/lispref/strings.texi (Formatting Strings): * doc/lispref/tips.texi (Documentation Tips): * etc/NEWS: * src/doc.c (syms_of_doc): Document this. * lisp/help-fns.el (describe-function-1): * src/doc.c (text_quoting_style, Fsubstitute_command_keys) (syms_of_doc): * src/editfns.c (styled_format): Omit now-unnecessary code. * src/lisp.h (LEAVE_QUOTING_STYLE): Remove. diff --git a/doc/lispref/help.texi b/doc/lispref/help.texi index b945e43..1bb2c7c 100644 --- a/doc/lispref/help.texi +++ b/doc/lispref/help.texi @@ -332,15 +332,13 @@ stands for no text itself. It is used only for a side effect: it specifies @var{mapvar}'s value as the keymap for any following @samp{\[@var{command}]} sequences in this documentation string. -@item ‘ -@itemx ` -(left single quotation mark and grave accent) both stand for a left quote. +@item ` +(grave accent) stands for a left quote. This generates a left single quotation mark, an apostrophe, or a grave accent depending on the value of @code{text-quoting-style}. -@item ’ -@itemx ' -(right single quotation mark and apostrophe) both stand for a right quote. +@item ' +(apostrophe) stands for a right quote. This generates a right single quotation mark or an apostrophe depending on the value of @code{text-quoting-style}. @@ -361,7 +359,8 @@ should use for single quotes in the wording of help and messages. If the variable's value is @code{curve}, the style is @t{‘like this’} with curved single quotes. If the value is @code{straight}, the style is @t{'like this'} with straight -apostrophes. If the value is @code{grave}, the style is @t{`like +apostrophes. If the value is @code{grave}, +quotes are not translated and the style is @t{`like this'} with grave accent and apostrophe, the standard style before Emacs version 25. The default value @code{nil} acts like @code{curve} if curved single quotes are displayable, and diff --git a/doc/lispref/strings.texi b/doc/lispref/strings.texi index 58ab02d..cf0505f 100644 --- a/doc/lispref/strings.texi +++ b/doc/lispref/strings.texi @@ -840,9 +840,8 @@ if any. @cindex curved quotes @cindex curly quotes This function acts like @code{format}, except it also converts any -curved single quotes in @var{string} as per the value of -@code{text-quoting-style}, and treats grave accent (@t{`}) and -apostrophe (@t{'}) as if they were curved single quotes. +grave accents (@t{`}) and apostrophes (@t{'}) in @var{string} as per the +value of @code{text-quoting-style}. A format that quotes with grave accents and apostrophes @t{`like this'} typically generates curved quotes @t{‘like this’}. In diff --git a/doc/lispref/tips.texi b/doc/lispref/tips.texi index d12de7a..a8589df 100644 --- a/doc/lispref/tips.texi +++ b/doc/lispref/tips.texi @@ -679,8 +679,7 @@ which quotes symbols with grave accent @t{`} and apostrophe @t{'}: @t{`like-this'} rather than @t{‘like-this’}. This older convention was designed for now-obsolete displays in which grave accent and apostrophe were mirror images. - -Documentation using either convention is converted to the user's +Documentation using this convention is converted to the user's preferred format when it is copied into a help buffer. @xref{Keys in Documentation}. diff --git a/etc/NEWS b/etc/NEWS index b4407a6..ed0bc5f 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -207,7 +207,7 @@ viewing HTML files and the like. *** Ediff can be prevented from pausing 1 second after reaching a breakpoint (e.g. with "f" and "o") by customizing the new option -`edebug-sit-on-break'. +'edebug-sit-on-break'. ** eww @@ -364,13 +364,19 @@ mode bindings: 'C-c @ C-a', 'C-c @ C-t', 'C-c @ C-d', and 'C-c @ C-e.' before running. This is controlled by the 'grep-save-buffers' variable. ++++ +** The variable 'text-quoting-style' no longer affects the treatment +of curved quotes in format arguments to functions like 'message' and +'format-message'. In particular, when this variable's value is +'grave', all quotes in formats are output as-is. + * Lisp Changes in Emacs 25.2 ** New var syntax-ppss-table to control the syntax-table used in syntax-ppss. +++ -** `define-derived-mode' can now specify an :after-hook form, which +** 'define-derived-mode' can now specify an :after-hook form, which gets evaluated after the new mode's hook has run. This can be used to incorporate configuration changes made in the mode hook into the mode's setup. diff --git a/lisp/help-fns.el b/lisp/help-fns.el index d1c8b2d..040152a 100644 --- a/lisp/help-fns.el +++ b/lisp/help-fns.el @@ -626,7 +626,7 @@ FILE is the file where FUNCTION was probably defined." ;; Avoid asking the user annoying questions if she decides ;; to save the help buffer, when her locale's codeset ;; isn't UTF-8. - (unless (memq text-quoting-style '(leave straight grave)) + (unless (memq text-quoting-style '(straight grave)) (set-buffer-file-coding-system 'utf-8)))))))) ;; Add defaults to `help-fns-describe-function-functions'. diff --git a/src/doc.c b/src/doc.c index 5326433..017dd17 100644 --- a/src/doc.c +++ b/src/doc.c @@ -704,8 +704,6 @@ text_quoting_style (void) ? default_to_grave_quoting_style () : EQ (Vtext_quoting_style, Qgrave)) return GRAVE_QUOTING_STYLE; - else if (EQ (Vtext_quoting_style, Qleave)) - return LEAVE_QUOTING_STYLE; else if (EQ (Vtext_quoting_style, Qstraight)) return STRAIGHT_QUOTING_STYLE; else @@ -982,29 +980,12 @@ Otherwise, return a new string. */) nchars++; changed = true; } - else if (! multibyte) - *bufp++ = *strp++, nchars++; else { - int len; - int ch = STRING_CHAR_AND_LENGTH (strp, len); - if ((ch == LEFT_SINGLE_QUOTATION_MARK - || ch == RIGHT_SINGLE_QUOTATION_MARK) - && quoting_style != CURVE_QUOTING_STYLE - && quoting_style != LEAVE_QUOTING_STYLE) - { - *bufp++ = ((ch == LEFT_SINGLE_QUOTATION_MARK - && quoting_style == GRAVE_QUOTING_STYLE) - ? '`' : '\''); - strp += len; - changed = true; - } - else - { - do - *bufp++ = *strp++; - while (--len != 0); - } + *bufp++ = *strp++; + if (multibyte) + while (! CHAR_HEAD_P (*strp)) + *bufp++ = *strp++; nchars++; } } @@ -1036,7 +1017,6 @@ void syms_of_doc (void) { DEFSYM (Qfunction_documentation, "function-documentation"); - DEFSYM (Qleave, "leave"); DEFSYM (Qgrave, "grave"); DEFSYM (Qstraight, "straight"); @@ -1051,15 +1031,16 @@ syms_of_doc (void) DEFVAR_LISP ("text-quoting-style", Vtext_quoting_style, doc: /* Style to use for single quotes in help and messages. Its value should be a symbol. It works by substituting certain single -quotes for certain other single quotes. This is done in help output and -`message' output. It is not done in `format'. +quotes for grave accent and apostrophe. This is done in help output +and in functions like `message' and `format-message'. It is not done +in `format'. -`leave' means do not do any substitutions. `curve' means quote with curved single quotes \\=‘like this\\=’. `straight' means quote with straight apostrophes \\='like this\\='. -`grave' means quote with grave accent and apostrophe \\=`like this\\='. -The default value nil acts like `curve' if curved single quotes are -displayable, and like `grave' otherwise. */); +`grave' means quote with grave accent and apostrophe \\=`like this\\='; +i.e., do not alter quote marks. The default value nil acts like +`curve' if curved single quotes are displayable, and like `grave' +otherwise. */); Vtext_quoting_style = Qnil; DEFVAR_BOOL ("internal--text-quoting-flag", text_quoting_flag, diff --git a/src/editfns.c b/src/editfns.c index afcf1ca..6b0996d 100644 --- a/src/editfns.c +++ b/src/editfns.c @@ -3977,8 +3977,6 @@ styled_format (ptrdiff_t nargs, Lisp_Object *args, bool message) multibyte = true; int quoting_style = message ? text_quoting_style () : -1; - if (quoting_style == LEAVE_QUOTING_STYLE) - quoting_style = -1; /* If we start out planning a unibyte result, then discover it has to be multibyte, we jump back to retry. */ @@ -4457,14 +4455,6 @@ styled_format (ptrdiff_t nargs, Lisp_Object *args, bool message) } else { - /* Named constants for the UTF-8 encodings of U+2018 LEFT SINGLE - QUOTATION MARK and U+2019 RIGHT SINGLE QUOTATION MARK. */ - enum - { - uLSQM0 = 0xE2, uLSQM1 = 0x80, uLSQM2 = 0x98, - /* uRSQM0 = 0xE2, uRSQM1 = 0x80, */ uRSQM2 = 0x99 - }; - unsigned char str[MAX_MULTIBYTE_LENGTH]; if ((format_char == '`' || format_char == '\'') @@ -4480,18 +4470,6 @@ styled_format (ptrdiff_t nargs, Lisp_Object *args, bool message) } else if (format_char == '`' && quoting_style == STRAIGHT_QUOTING_STYLE) convsrc = "'"; - else if (format_char == uLSQM0 && CURVE_QUOTING_STYLE < quoting_style - && multibyte_format - && (unsigned char) format[0] == uLSQM1 - && ((unsigned char) format[1] == uLSQM2 - || (unsigned char) format[1] == uRSQM2)) - { - convsrc = (((unsigned char) format[1] == uLSQM2 - && quoting_style == GRAVE_QUOTING_STYLE) - ? "`" : "'"); - format += 2; - memset (&discarded[format0 + 1 - format_start], 2, 2); - } else { /* Copy a single character from format to buf. */ diff --git a/src/lisp.h b/src/lisp.h index de74a47..1fc6130 100644 --- a/src/lisp.h +++ b/src/lisp.h @@ -4198,9 +4198,6 @@ extern void syms_of_callproc (void); /* Defined in doc.c. */ enum text_quoting_style { - /* Leave quotes unchanged. */ - LEAVE_QUOTING_STYLE, - /* Use curved single quotes ‘like this’. */ CURVE_QUOTING_STYLE, commit 8939ae68d430ef272194ac64144ceb58ae0dbd3f Author: Alan Mackenzie Date: Tue May 10 14:36:02 2016 +0000 Revert "Fix spurious fontification of "for (; a * b;)" in CC Mode." This reverts commit 89d1776b81ab552192ee41f13ce84ff86bda4556. It is being reverted because it slowed down CC Mode's fontification too much (factor ~3). It was the fix to bug #7918. diff --git a/lisp/progmodes/cc-fonts.el b/lisp/progmodes/cc-fonts.el index 6c34851..e171b20 100644 --- a/lisp/progmodes/cc-fonts.el +++ b/lisp/progmodes/cc-fonts.el @@ -1205,20 +1205,8 @@ casts and declarations are fontified. Used on level 2 and higher." 'font-lock-keyword-face) (looking-at c-not-decl-init-keywords)) (and c-macro-with-semi-re - (looking-at c-macro-with-semi-re)) ; 2008-11-04 - (save-excursion ; A construct after a ; in a `for' statement - ; can't be a declaration. - (and (c-go-up-list-backward) - (eq (char-after) ?\() - (progn (c-backward-syntactic-ws) - (c-simple-skip-symbol-backward)) - (looking-at c-paren-stmt-key) - (progn (goto-char match-pos) - (while (and (eq (char-before) ?\)) - (c-go-list-backward)) - (c-backward-syntactic-ws)) - (eq (char-before) ?\;))))) - ;; Don't do anything more if we're looking at something that + (looking-at c-macro-with-semi-re))) ; 2008-11-04 + ;; Don't do anything more if we're looking at a keyword that ;; can't start a declaration. t commit fc8a4e0ad44667cff79750946ebc695968e95b01 Author: Glenn Morris Date: Tue May 10 07:18:12 2016 -0400 ; Auto-commit of loaddefs files. diff --git a/lisp/emacs-lisp/eieio.el b/lisp/emacs-lisp/eieio.el index 51a6f7b..f045e26 100644 --- a/lisp/emacs-lisp/eieio.el +++ b/lisp/emacs-lisp/eieio.el @@ -984,7 +984,7 @@ Optional argument GROUP is the sub-group of slots to display. ;;;*** -;;;### (autoloads nil "eieio-opt" "eieio-opt.el" "5bd32f1033d0e2eee7c32c0ad28330fc") +;;;### (autoloads nil "eieio-opt" "eieio-opt.el" "0b9c6be48520da2085812f6e7fed9792") ;;; Generated autoloads from eieio-opt.el (autoload 'eieio-browse "eieio-opt" "\ commit d0d9f55b632717fccb605e0a204ebdd5ffe8608f Author: Dmitry Gutov Date: Tue May 10 02:53:20 2016 +0300 Allow newlines inside cl function arglists * lisp/help.el (help-add-fundoc-usage): Allow newlines inside ARGLIST (bug#21839). diff --git a/lisp/help.el b/lisp/help.el index 061daac..7289375 100644 --- a/lisp/help.el +++ b/lisp/help.el @@ -1395,7 +1395,7 @@ ARGLIST can also be t or a string of the form \"(FUN ARG1 ARG2 ...)\"." (if (< (- (match-end 0) (match-beginning 0)) 2) "\n" "") "\n\n") (if (stringp arglist) - (if (string-match "\\`[^ ]+\\(.*\\))\\'" arglist) + (if (string-match "\\`[^ ]+\\(\\(?:.\\|\n\\)*\\))\\'" arglist) (concat "(fn" (match-string 1 arglist) ")") (error "Unrecognized usage format")) (help--make-usage-docstring 'fn arglist))))) commit 963541a6540c40559645c312cea7f35c3c649556 Author: Dmitry Gutov Date: Tue May 10 01:15:12 2016 +0300 Publicize cl--generic-all-functions * lisp/emacs-lisp/cl-generic.el (cl-generic-all-functions): Rename from cl--generic-all-functions. Update both callers. * lisp/cedet/semantic/db-el.el (semanticdb-find-tags-external-children-of-type-method): And use it here (bug#23042). diff --git a/lisp/cedet/semantic/db-el.el b/lisp/cedet/semantic/db-el.el index 83a2680..a85b902 100644 --- a/lisp/cedet/semantic/db-el.el +++ b/lisp/cedet/semantic/db-el.el @@ -336,7 +336,7 @@ Return a list of tags." (mapcar 'semanticdb-elisp-sym->tag ;; Fancy eieio function that knows all about ;; built in methods belonging to CLASS. - (eieio-all-generic-functions class))))) + (cl-generic-all-functions class))))) ) taglst)))) diff --git a/lisp/emacs-lisp/cl-extra.el b/lisp/emacs-lisp/cl-extra.el index b5dfe48..8bf0675 100644 --- a/lisp/emacs-lisp/cl-extra.el +++ b/lisp/emacs-lisp/cl-extra.el @@ -822,7 +822,7 @@ including `cl-block' and `cl-eval-when'." (cl--describe-class-slots class) ;; Describe all the methods specific to this class. - (let ((generics (cl--generic-all-functions type))) + (let ((generics (cl-generic-all-functions type))) (when generics (insert (propertize "Specialized Methods:\n\n" 'face 'bold)) (dolist (generic generics) diff --git a/lisp/emacs-lisp/cl-generic.el b/lisp/emacs-lisp/cl-generic.el index 7ad9f30..37edf45 100644 --- a/lisp/emacs-lisp/cl-generic.el +++ b/lisp/emacs-lisp/cl-generic.el @@ -937,7 +937,7 @@ MET-NAME is a cons (SYMBOL . SPECIALIZERS)." (setq applies t))) applies)) -(defun cl--generic-all-functions (&optional type) +(defun cl-generic-all-functions (&optional type) "Return a list of all generic functions. Optional TYPE argument returns only those functions that contain methods for TYPE." diff --git a/lisp/emacs-lisp/eieio-opt.el b/lisp/emacs-lisp/eieio-opt.el index 8a4df06..c1f8297 100644 --- a/lisp/emacs-lisp/eieio-opt.el +++ b/lisp/emacs-lisp/eieio-opt.el @@ -162,7 +162,7 @@ are not abstract." (defun eieio-display-method-list () "Display a list of all the methods and what features are used." (interactive) - (let* ((meth1 (cl--generic-all-functions)) + (let* ((meth1 (cl-generic-all-functions)) (meth (sort meth1 (lambda (a b) (string< (symbol-name a) (symbol-name b))))) commit 3c581d56ad36f744d6657b46ca6f1b4f23680aed Author: Michael Albinus Date: Mon May 9 20:39:36 2016 +0200 ; Fix typo diff --git a/etc/NEWS b/etc/NEWS index 785d14b..3031cab 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -1588,7 +1588,7 @@ process filter, sentinel, etc., through keyword arguments (similar to 'make-network-process'). +++ -** Subprocesses are automatically told about changes in window dimensions +** Subprocesses are automatically told about changes in window dimensions. The new option 'window-adjust-process-window-size-function' controls how subprocesses are told to adapt their logical window sizes to changes in the Emacs window configuration. Its default value calls commit e58f900e6d7e9118c8fd4783d87a4f122c0bccc1 Author: Alan Mackenzie Date: Mon May 9 18:12:52 2016 +0000 Add some "safe-local-variable" declarations for compatibility with master. These enable C files from the master repository to be visited in Emacs 25 without generating irritating questions about configuration variable safety. * lisp/progmodes/cc-vars.el: (c-string-list-p, c-string-or-string-list-p): New functions. (c-noise-macro-names, c-noise-macro-with-parens-names): give the safe-local-variable property c-string-list-p. (c-macro-names-with-semicolon): give the safe-local-variable property c-string-or-string-list-p. diff --git a/lisp/progmodes/cc-vars.el b/lisp/progmodes/cc-vars.el index 8cee733..b46b9b8 100644 --- a/lisp/progmodes/cc-vars.el +++ b/lisp/progmodes/cc-vars.el @@ -229,7 +229,20 @@ See `c-offsets-alist'." (setq offset (cdr offset))) (null offset))))) - +(defun c-string-list-p (val) + "Return non-nil if VAL is a list of strings." + (and + (listp val) + (catch 'string + (dolist (elt val) + (if (not (stringp elt)) + (throw 'string nil))) + t))) + +(defun c-string-or-string-list-p (val) + "Return non-nil if VAL is a string or a list of strings." + (or (stringp val) + (c-string-list-p val))) ;;; User variables @@ -1621,6 +1634,10 @@ names).")) ;; Non-customizable variables, still part of the interface to CC Mode +;; The following two are preparations for Emacs 25.2 (2016-05-09): +(put 'c-noise-macro-names 'safe-local-variable #'c-string-list-p) +(put 'c-noise-macro-with-parens-names 'safe-local-variable #'c-string-list-p) + (defvar c-macro-with-semi-re nil ;; Regular expression which matches a (#define'd) symbol whose expansion ;; ends with a semicolon. @@ -1647,6 +1664,8 @@ variables. Note that currently \(2008-11-04) this variable is a prototype, and is likely to disappear or change its form soon.") (make-variable-buffer-local 'c-macro-names-with-semicolon) +(put 'c-macro-names-with-semicolon 'safe-local-variable + #'c-string-or-string-list-p) (defun c-make-macro-with-semi-re () ;; Convert `c-macro-names-with-semicolon' into the regexp