diff options
| author | Glenn Morris <rgm@gnu.org> | 2020-04-13 09:02:29 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2020-04-13 09:02:29 -0700 |
| commit | 0a4b992c422d98fbb351d3b03265eb1029012c1d (patch) | |
| tree | 8216a67339ed2fecc3d889678278b9a3cb7fb914 /lisp/progmodes/elisp-mode.el | |
| parent | d0b9cf876fa62e3584a062e123a87e28278782cf (diff) | |
| parent | 1dfc497fac22c199a944ef64233266bd6cd2fee6 (diff) | |
| download | emacs-0a4b992c422d98fbb351d3b03265eb1029012c1d.tar.gz | |
Merge from origin/emacs-27
1dfc497fac Minor wording change in Introduction to Programming in Ema...
ff09b4eeac Fix 'flymake-show-diagnostics-buffer' when line numbers ar...
63e8d0ea87 Fix last changes describing mail commands
01212a762f Do setup Flymake in file-less Elisp buffers
36873ef2b2 Fix error message for ‘cl-struct-unknown-slot’ (bug#39995)
3f9310b0fe Fix and improve documentation of mail-related features
1482a75efa Fix build failure with Fx_gtk_debug
cf57663f2a Mention jit-lock deferred as an alternative to fast-but-im...
# Conflicts:
# etc/NEWS
Diffstat (limited to 'lisp/progmodes/elisp-mode.el')
| -rw-r--r-- | lisp/progmodes/elisp-mode.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/progmodes/elisp-mode.el b/lisp/progmodes/elisp-mode.el index 20ec370dcb6..f85fd771ca8 100644 --- a/lisp/progmodes/elisp-mode.el +++ b/lisp/progmodes/elisp-mode.el @@ -291,9 +291,9 @@ Blank lines separate paragraphs. Semicolons start comments. (unless (let* ((bfname (buffer-file-name)) (fname (and (stringp bfname) (file-name-nondirectory bfname)))) - (or (not (stringp fname)) - (string-match "\\`\\.#" fname) - (string-equal dir-locals-file fname))) + (and (stringp fname) + (or (string-match "\\`\\.#" fname) + (string-equal dir-locals-file fname)))) (add-hook 'flymake-diagnostic-functions #'elisp-flymake-checkdoc nil t) (add-hook 'flymake-diagnostic-functions #'elisp-flymake-byte-compile nil t))) |