[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 0bc9e7b 05/15: Merge two conditions and fix indentation
From: |
Jonas Bernoulli |
Subject: |
master 0bc9e7b 05/15: Merge two conditions and fix indentation |
Date: |
Thu, 13 Aug 2020 05:36:54 -0400 (EDT) |
branch: master
commit 0bc9e7b8f5658c3f4f2d881de3aed158c6f49021
Author: Jonas Bernoulli <jonas@bernoul.li>
Commit: Jonas Bernoulli <jonas@bernoul.li>
Merge two conditions and fix indentation
The motivation behind this change is that the indentation of some
lines was outright wrong. If we address that issue, then we might
as well also address the issue that some code is needlessly nested
an additional level. That we can fix by merging the conditions.
By doing these two changes in on commit we have to change the fewest
lines. Even though we are moving to using just spaces for indentation
of the modified lines, other lines in the same function are left alone
and continue to us tabs+spaces for indentation. That is not "wrong",
but just the style we are slowly migrating away from when touching
lines for other reasons.
Discussed in bug#42397.
* lisp/emacs-lisp/eldoc.el (eldoc-minibuffer-message): Merge two
conditions and fix indentation.
---
lisp/emacs-lisp/eldoc.el | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/lisp/emacs-lisp/eldoc.el b/lisp/emacs-lisp/eldoc.el
index 19b3bd7..4825b5c 100644
--- a/lisp/emacs-lisp/eldoc.el
+++ b/lisp/emacs-lisp/eldoc.el
@@ -289,13 +289,13 @@ Otherwise work like `message'."
(or (window-in-direction 'above (minibuffer-window))
(minibuffer-selected-window)
(get-largest-window)))
- (when mode-line-format
- (unless (and (listp mode-line-format)
- (assq 'eldoc-mode-line-string mode-line-format))
+ (when (and mode-line-format
+ (not (and (listp mode-line-format)
+ (assq 'eldoc-mode-line-string
mode-line-format))))
(setq mode-line-format
(list "" '(eldoc-mode-line-string
(" " eldoc-mode-line-string " "))
- mode-line-format))))
+ mode-line-format)))
(setq eldoc-mode-line-string
(when (stringp format-string)
(apply #'format-message format-string args)))
- master 9446088 01/15: ; * lisp/epg.el (epg-signature-to-string): Use cl-case., (continued)
- master 9446088 01/15: ; * lisp/epg.el (epg-signature-to-string): Use cl-case., Jonas Bernoulli, 2020/08/13
- master cb58a3c 09/15: * test/src/emacs-module-tests.el: Use proper outline headings., Jonas Bernoulli, 2020/08/13
- master e118b79 10/15: * lisp/obsolete/longlines.el: Use proper outline headings., Jonas Bernoulli, 2020/08/13
- master b88e5b4 12/15: * lisp/font-lock.el: Split the Commentary into subsections., Jonas Bernoulli, 2020/08/13
- master c5b9d2a 04/15: Split EasyPG libraries into outline sections, Jonas Bernoulli, 2020/08/13
- master 838a1a3 15/15: Update section heading conventions for libraries, Jonas Bernoulli, 2020/08/13
- master 2d93342 13/15: * lisp/font-lock.el: No longer use headings as end of section markers., Jonas Bernoulli, 2020/08/13
- master aaa69dc 06/15: * lisp/progmodes/compile.el: Remove unnecessary comments., Jonas Bernoulli, 2020/08/13
- master 7cb029d 14/15: ; * lisp/emacs-lisp/autoload.el: Begin summary line with three semicolons., Jonas Bernoulli, 2020/08/13
- master 5409732 11/15: * lisp/net/imap.el: Use proper outline headings, Jonas Bernoulli, 2020/08/13
- master 0bc9e7b 05/15: Merge two conditions and fix indentation,
Jonas Bernoulli <=
- master d59c018 07/15: ; * lisp/whitespace.el: Capitalize "Code" section heading., Jonas Bernoulli, 2020/08/13
- master 9d267db 08/15: * lisp/mail/smtpmail.el: Use outline headings., Jonas Bernoulli, 2020/08/13