[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] scratch/inhibit-message3 5f68873: src/xdisp.c (message3):
From: |
Oleh Krehel |
Subject: |
[Emacs-diffs] scratch/inhibit-message3 5f68873: src/xdisp.c (message3): Don't inhibit logging |
Date: |
Wed, 22 Apr 2015 06:05:00 +0000 |
branch: scratch/inhibit-message3
commit 5f6887383144ad87d96de101f27513a0785fd2ad
Author: Oleh Krehel <address@hidden>
Commit: Oleh Krehel <address@hidden>
src/xdisp.c (message3): Don't inhibit logging
* src/xdisp.c (message3): When `Vinhibit_message' is set, inhibit only
`message3_nolog', don't touch the logging.
---
src/xdisp.c | 37 ++++++++++++++++++-------------------
1 files changed, 18 insertions(+), 19 deletions(-)
diff --git a/src/xdisp.c b/src/xdisp.c
index 0c069b9..c8fdb9e 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -10035,29 +10035,28 @@ message_log_check_duplicate (ptrdiff_t prev_bol_byte,
ptrdiff_t this_bol_byte)
void
message3 (Lisp_Object m)
{
- if (NILP (Vinhibit_message)) {
- struct gcpro gcpro1;
+ struct gcpro gcpro1;
- GCPRO1 (m);
- clear_message (true, true);
- cancel_echoing ();
+ GCPRO1 (m);
+ clear_message (true, true);
+ cancel_echoing ();
- /* First flush out any partial line written with print. */
- message_log_maybe_newline ();
- if (STRINGP (m))
- {
- ptrdiff_t nbytes = SBYTES (m);
- bool multibyte = STRING_MULTIBYTE (m);
- char *buffer;
- USE_SAFE_ALLOCA;
- SAFE_ALLOCA_STRING (buffer, m);
- message_dolog (buffer, nbytes, true, multibyte);
- SAFE_FREE ();
- }
+ /* First flush out any partial line written with print. */
+ message_log_maybe_newline ();
+ if (STRINGP (m))
+ {
+ ptrdiff_t nbytes = SBYTES (m);
+ bool multibyte = STRING_MULTIBYTE (m);
+ char *buffer;
+ USE_SAFE_ALLOCA;
+ SAFE_ALLOCA_STRING (buffer, m);
+ message_dolog (buffer, nbytes, true, multibyte);
+ SAFE_FREE ();
+ }
+ if (NILP (Vinhibit_message)) {
message3_nolog (m);
-
- UNGCPRO;
}
+ UNGCPRO;
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] scratch/inhibit-message3 5f68873: src/xdisp.c (message3): Don't inhibit logging,
Oleh Krehel <=