Commit c1b5000d authored by Paul Eggert's avatar Paul Eggert
Browse files

Merge from origin/emacs-25

d841a03c ; Spelling fix
a6ae4792 Post AppDefined events from the main thread ONLY (bug#23934)
d35d398b Update to the AUTHORS file for Bob Weiner
4d2f4dfd Revert "Fix local printer set to left aligned string formatter."
cd1b4d60 Revert "Fix ses-delete-blanks to delete only blanks + documen...
f7ceb8e0 Revert "Fix English."
baa7abde Improve doc strings of 'gud-gdb' and 'gdb'
aa4271ab Fix doc string of 'minibuffer-message-timeout'
b275cc76 Fix English.
3c97b0f7 Fix ses-delete-blanks to delete only blanks + documentation.
272391f1 profiler: document prefix arg for tree expansion
442cc39e Clarify usage of eshell-visual-options
b443c3c7 Fix comment in files-in-below-directory
8a38e948 Fix local printer set to left aligned string formatter.
0f0b191a ; Fix typos in NEWS
6bdf687a ; * etc/NEWS: Remove temporary marks
parents fe322583 d841a03c
......@@ -15465,7 +15465,7 @@ Here is the function:
@group
(cond
;; check to see whether filename ends in '.el'
;; and if so, append its name to a list.
;; and if so, add its name to a list.
((equal ".el" (substring (car (car current-directory-list)) -3))
(setq el-files-list
(cons (car (car current-directory-list)) el-files-list)))
......
......@@ -840,8 +840,9 @@ called, followed by how much resource (processor or memory) it used in
absolute and percentage times since profiling started. If a given
line has a @samp{+} symbol at the left-hand side, you can expand that
line by typing @key{RET}, in order to see the function(s) called by
the higher-level function. Pressing @key{RET} again will collapse
back to the original state.
the higher-level function. Use a prefix argument (@key{C-u RET}) to
see the whole call tree below a function. Pressing @key{RET} again
will collapse back to the original state.
Press @kbd{j} or @kbd{mouse-2} to jump to the definition of a function.
Press @kbd{d} to view a function's documentation.
......
......@@ -486,7 +486,7 @@ Bob Rogers: changed vc-dir.el vc-svn.el cperl-mode.el diff.el ewoc.el
ffap.el files.el maintaining.texi sql.el thingatpt.el vc.el
vc1-xtra.texi
Bob Weiner: changed info.el quail.el
Bob Weiner: changed dframe.el etags.c info.el rmail.el rmailsum.el speedbar.el
Bojan Petrovic: changed pop3.el
......
This diff is collapsed.
......@@ -102,10 +102,11 @@ See also `eshell-visual-commands' and `eshell-visual-options'."
of commands with options that present their output in a visual
fashion. For example, a sensible entry would be
(\"git\" \"--help\")
(\"git\" \"--help\" \"--paginate\")
because \"git <command> --help\" shows the command's
documentation with a pager.
documentation with a pager and \"git --paginate <command>\"
always uses a pager for output.
See also `eshell-visual-commands' and `eshell-visual-subcommands'."
:type '(repeat (cons (string :tag "Command")
......
......@@ -693,7 +693,8 @@ With a prefix argument, expand the whole subtree."
(defun profiler-report-toggle-entry (&optional arg)
"Expand entry at point if the tree is collapsed,
otherwise collapse."
otherwise collapse. With prefix argument, expand all subentries
below entry at point."
(interactive "P")
(or (profiler-report-expand-entry arg)
(profiler-report-collapse-entry)))
......
......@@ -673,14 +673,18 @@ NOARG must be t when this macro is used outside `gud-def'"
;;;###autoload
(defun gdb (command-line)
"Run gdb on program FILE in buffer *gud-FILE*.
The directory containing FILE becomes the initial working directory
and source-file directory for your debugger.
COMMAND-LINE is the shell command for starting the gdb session.
It should be a string consisting of the name of the gdb
executable followed by command line options. The command line
options should include \"-i=mi\" to use gdb's MI text interface.
"Run gdb passing it COMMAND-LINE as arguments.
If COMMAND-LINE names a program FILE to debug, gdb will run in
a buffer named *gud-FILE*, and the directory containing FILE
becomes the initial working directory and source-file directory
for your debugger.
If COMMAND-LINE requests that gdb attaches to a process PID, gdb
will run in *gud-PID*, otherwise it will run in *gud*; in these
cases the initial working directory is the default-directory of
the buffer in which this command was invoked.
COMMAND-LINE should include \"-i=mi\" to use gdb's MI text interface.
Note that the old \"--annotate\" option is no longer supported.
If option `gdb-many-windows' is nil (the default value) then gdb just
......
......@@ -733,9 +733,15 @@ It should return a list of completion strings.")
;; The old gdb command (text command mode). The new one is in gdb-mi.el.
;;;###autoload
(defun gud-gdb (command-line)
"Run gdb on program FILE in buffer *gud-FILE*.
The directory containing FILE becomes the initial working
directory and source-file directory for your debugger."
"Run gdb passing it COMMAND-LINE as arguments.
If COMMAND-LINE names a program FILE to debug, gdb will run in
a buffer named *gud-FILE*, and the directory containing FILE
becomes the initial working directory and source-file directory
for your debugger.
If COMMAND-LINE requests that gdb attaches to a process PID, gdb
will run in *gud-PID*, otherwise it will run in *gud*; in these
cases the initial working directory is the default-directory of
the buffer in which this command was invoked."
(interactive (list (gud-query-cmdline 'gud-gdb)))
(when (and gud-comint-buffer
......
......@@ -630,8 +630,8 @@ global value outside of any lexical scope. */)
}
/* FIXME: It has been previously suggested to make this function an
alias for symbol-function, but upon discussion at Debbug#23957,
there is a risk breaking backward compatiblity, as some users of
alias for symbol-function, but upon discussion at Bug#23957,
there is a risk breaking backward compatibility, as some users of
fboundp may expect `t' in particular, rather than any true
value. An alias is still welcome so long as the compatibility
issues are addressed. */
......
......@@ -11689,7 +11689,8 @@ suppressed only after special commands that leave
DEFVAR_LISP ("minibuffer-message-timeout", Vminibuffer_message_timeout,
doc: /* How long to display an echo-area message when the minibuffer is active.
If the value is not a number, such messages don't time out. */);
If the value is a number, it should be specified in seconds.
If the value is not a number, such messages never time out. */);
Vminibuffer_message_timeout = make_number (2);
DEFVAR_LISP ("throw-on-input", Vthrow_on_input,
......
......@@ -380,9 +380,9 @@ char const * nstrace_fullscreen_type_name (int);
#endif
#ifdef NS_IMPL_GNUSTEP
BOOL applicationDidFinishLaunchingCalled;
#endif
@public
int nextappdefined;
#endif
}
- (void)logNotification: (NSNotification *)notification;
- (void)antialiasThresholdDidChange:(NSNotification *)notification;
......
......@@ -3927,8 +3927,8 @@ overwriting cursor (usually when cursor on a tab) */
{
NSTRACE_WHEN (NSTRACE_GROUP_EVENTS, "ns_send_appdefined(%d)", value);
#ifdef NS_IMPL_GNUSTEP
// GNUstep needs postEvent to happen on the main thread.
// Cocoa needs nextEventMatchingMask to happen on the main thread too.
if (! [[NSThread currentThread] isMainThread])
{
EmacsApp *app = (EmacsApp *)NSApp;
......@@ -3938,7 +3938,6 @@ overwriting cursor (usually when cursor on a tab) */
waitUntilDone:YES];
return;
}
#endif
/* Only post this event if we haven't already posted one. This will end
the [NXApp run] main loop after having processed all events queued at
......@@ -5551,12 +5550,10 @@ - (void)timeout_handler: (NSTimer *)timedEntry
ns_send_appdefined (-2);
}
#ifdef NS_IMPL_GNUSTEP
- (void)sendFromMainThread:(id)unused
{
ns_send_appdefined (nextappdefined);
}
#endif
- (void)fd_handler:(id)unused
/* --------------------------------------------------------------------------
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment