Otherwise it breaks C-M-x on (progn (defmacro x ..) (... (x ...))).
Furthermore, many callers do their own macroexpansion anyway.
(elisp--eval-last-sexp): Do macroexpansion to make up for it.
(icalendar-export-region): Remove unused vars 'start', 'sum', and
'contents-n-summary'.
(icalendar--parse-summary-and-rest): Remove unused var 'pos-sum' and 'sum'.
(icalendar--convert-float-to-ical): Use calendar-let* to bind vars
'date' and 'entry'.
(icalendar--convert-non-recurring-all-day-to-diary):
Remove 'event' arg. Update callers.
(icalendar--convert-non-recurring-not-all-day-to-diary): Remove 'event'
and 'dtend-dec' args. Update callers.
Glenn Morris [Sat, 17 Feb 2018 15:50:28 +0000 (07:50 -0800)]
Merge from origin/emacs-26
e5a2933 (origin/emacs-26) lisp/vc/: documentation fixes f21f8e6 Document 'desktop-files-not-to-save' d8917eb Improve documentation of Profiling features b228839 Improve indexing of "performance" in ELisp manual ab67b3e Minor change in Emacs manual's VC chapter c352434 Avoid memory corruption with specpdl overflow + edebug (Bug#3... 593bbda Document comment-fill-column in the manual (Bug#11636) bd4cc8d * doc/emacs/dired.texi (Marks vs Flags): Copyedits. 69107f3 ; Fix doc typos related to indefinite articles aaad1e6 Merge branch 'emacs-26' of git.savannah.gnu.org:/srv/git/emac... 5906418 More fixes for the Emacs manual 9ab3df1 ; Fix doc typos related to indefinite articles 66a4e65 ; Fix doc typos related to indefinite articles 35e5c57 ; Fix doc typos related to indefinite articles
Noam Postavsky [Mon, 5 Feb 2018 01:43:26 +0000 (20:43 -0500)]
Use pkg-config to find lcms2 CFLAGS and LIBS (Bug#30346)
* configure.ac: Use EMACS_CHECK_MODULES fors LCMS2 rather than
AC_SEARCH_LIBS.
* src/Makefile.in: Get LCMS2_LIBS and LCMS2_CFLAGS from configure,
instead of just LIBLCMS2.
Alan Third [Wed, 14 Feb 2018 20:28:46 +0000 (20:28 +0000)]
Fix modifier key handling on macOS
* configure.ac: Use the Carbon framework on macOS.
* src/nsterm.m (ns_get_shifted_character) [NS_IMPL_COCOA]: New function.
(EmacsView::keyDown) [NS_IMPL_COCOA]: Use ns_get_shifted_character
when we have shift style modifiers.
Eli Zaretskii [Sat, 17 Feb 2018 12:26:49 +0000 (14:26 +0200)]
Make echo-area buffers almost always multibyte
* src/xdisp.c (setup_echo_area_for_printing, set_message_1): Ensure
the echo-area buffer is multibyte, unless
unibyte-display-via-language-environment is non-nil, and the text
we are to display is or could be unibyte. (Bug#30405)
* lisp/startup.el (early-init-file): New variable.
(load-user-init-file): New function.
(command-line): Load the early init file using `load-user-init-file'.
Move the check for an invalid username to just before that, and move
the initialization of the package system to just after. Load the
regular init file using `load-user-init-file'.
* lisp/emacs-lisp/package.el (package--ensure-init-file): Remove
definition, usage, and documentation.
(package--init-file-ensured): Remove definition and usage.
* src/lread.c (Vuser_init_file): Note change in semantics due to its
usage while loading the early init file.
* doc/emacs/custom.texi: Document early init file.
* doc/emacs/package.texi: Document changes to when package-initialize
is called. Change terminology for package 'loading'.
* doc/lispref/os.texi: Document early init file. Update startup
summary.
* doc/lispref/package.texi: Document changes to when
package-initialize is called, and advise against calling it in the
init file. Change terminology for package 'loading'.
* doc/misc/org.texi: Don't recommend to call package-initialize in the
init file.
Alan Mackenzie [Sat, 17 Feb 2018 09:14:54 +0000 (09:14 +0000)]
Fix the change from 2018-02-15 which didn't mention literals
* doc/emacs/programs.texi (Left Margin Paren): Document that opening
delimiters at column 0 which are inside strings or comments aren't regarded as
defun starts.
Eli Zaretskii [Sat, 17 Feb 2018 08:28:29 +0000 (10:28 +0200)]
Minor change in Emacs manual's VC chapter
* doc/emacs/maintaining.texi (Log Buffer): Mention the "Summary"
header. Suggested by Michael Albinus <michael.albinus@gmx.de> in
emacs-manual-bugs@gnu.org.
Noam Postavsky [Fri, 16 Feb 2018 03:13:51 +0000 (22:13 -0500)]
Avoid memory corruption with specpdl overflow + edebug (Bug#30481)
If grow_specpdl fails due to outgrowing max_specpdl_size, it will
signal an error *before* growing the specpdl array. Therefore, when
handling the signal, specpdl_ptr points past the end of the specpdl
array and any further use of of specpdl before unwinding (e.g., if
edebug binds signal-hook-function) will cause memory corruption.
* src/eval.c (signal_or_quit): Don't call `signal-hook-function' if
the specpdl_ptr is already past the end of the specpdl array.
* test/src/eval-tests.el (eval-tests--exceed-specbind-limit)
(eval-exceed-specbind-with-signal-hook): New test & helper function.
Eli Zaretskii [Fri, 16 Feb 2018 21:37:38 +0000 (23:37 +0200)]
More fixes for the Emacs manual
* doc/emacs/vc1-xtra.texi (Customizing VC): Update the list of
backends.
* doc/emacs/maintaining.texi (Version Control): Add SRC to the
list of VCS. Remove the description of vc-state-refresh.
(Version Control Systems): Update the description of CVS.
(VC Change Log): Amend the list of VCS that don't support
vc0print-root-log.
(VCS Changesets, VCS Repositories, Advanced C-x v v)
(VC Change Log): Mention SRC with RCS where appropriate.
(VC Directory Commands): More accurate description of
vc-dir-hide-up-to-date. Suggested by Michael Albinus
<michael.albinus@gmx.de> in emacs-manual-bugs@gnu.org.
Glenn Morris [Fri, 16 Feb 2018 17:44:04 +0000 (09:44 -0800)]
Merge from origin/emacs-26
a06a8ed (origin/emacs-26) ; * lisp/vc/vc-git.el (vc-git--program-vers... edc06ad Make 'byte-compile-error-on-warn' a safe file variable 9f5d8da ; * lisp/textmodes/flyspell.el (flyspell-auto-correct-word): ... f73905a Fix the doc string of flyspell-auto-correct-word e9c7ddc Improve the MS-Windows appendix of the Emacs manual 6ddb4bd Fix 'vc-git--program-version' 63c93f7 Fix typos and wording in the Emacs manual 42f15b0 * doc/emacs/programs.texi (Semantic): Order programming langu... b46be29 More improvements for the Emacs manual 874c0ed Minor wording change in Emacs manual 53511f9 Another set of changes for the manual 78426b8 Improvements on tramp.texi 0dca618 Tramp minor doc fixes
Matthias Dahl [Fri, 16 Feb 2018 15:57:40 +0000 (17:57 +0200)]
Fix wait_reading_process_output wait_proc hang
* src/process.c (read_process_output): Track bytes read from
a process.
(wait_reading_process_output): If called recursively through
timers and/or process filters via accept-process-output, it is
possible that the output of wait_proc has already been read by
one of those recursive calls, leaving the original call hanging
forever if no further output arrives through that fd and no
timeout has been set. Fix that by using the process read
accounting to keep track of how many bytes have been read and
use that as a condition to break out of the infinite loop and
return to the caller as well as to calculate the proper return
value (if a wait_proc is given that is).
* src/process.h (struct Lisp_Process): Add nbytes_read to track
bytes read from a process.
Aaron Jensen [Fri, 16 Feb 2018 15:43:04 +0000 (17:43 +0200)]
Don't flash previous buffer when connecting with emacsclient
* lisp/server.el (server-execute): Accept lambda for creating
frame rather than frame. Ensure newly created tty frame
initially shows the correct buffer.
(server-process-filter): Pass a lambda to server-execute to create
a frame. (Bug#24218)
Eli Zaretskii [Fri, 16 Feb 2018 10:46:32 +0000 (12:46 +0200)]
Improve the MS-Windows appendix of the Emacs manual
* doc/emacs/msdos.texi (Windows Startup): Describe the pinned
shortcuts for starting Emacs.
(Text and Binary): Minor wording changes.
(Windows Files): Mention 'read-file-name-completion-ignore-case'.
(ls in Lisp): Update the list of supported 'ls' switches.
Document 'ls-lisp-use-string-collate' and
'ls-lisp-UCA-like-collation'.
(Windows HOME): Mention warnings displayed at startup when
deprecated locations of HOME and/or deprecated names for init
files are used.
(Windows Keyboard): Mention delete-selection-mode.
Alan Mackenzie [Thu, 15 Feb 2018 20:58:15 +0000 (20:58 +0000)]
Document open-paren-in-column-0-is-defun-start being of less importance
* doc/emacs/programs.texi (Left Margin Paren): Update to reflect the recent
change in syntax.c, whereby a paren at column 0 is no longer taken as a
beginning of defun in moving backwards over comments.
Eli Zaretskii [Thu, 15 Feb 2018 18:38:13 +0000 (20:38 +0200)]
More improvements for the Emacs manual
* doc/emacs/programs.texi (Basic Indent, Comment Commands): Fix
typos.
* doc/emacs/text.texi (TeX Print, HTML Mode, Enriched Faces): Fix
typos.
* doc/emacs/help.texi (Help Files): Improve @uref usage. Reported
by Stefan Kamphausen <stefan.kamphausen@acrolinx.com> in
emacs-manual-bugs@gnu.org.
* doc/emacs/fortran-xtra.texi (ForIndent Commands): Fix a typo.
(ForIndent Commands, Fortran Columns): Add empty lines between
@items in a @table.
(ForIndent Cont, ForIndent Num, Fortran Columns): Mention
'column-number-indicator-zero-based'.
(ForIndent Vars): Fix a typo.
(Fortran Comments): Fix punctuation.
(ForIndent Cont, Fortran Autofill): Fix markup of keyboard input.
* doc/emacs/programs.texi (Comments): Fix a typo.
(Comment Commands): More accurate description of the commands.
(Options for Comments): Don't mention "hook".
(Man Page): Prefer "M-x man" if available.
(Hideshow): Fix the command key sequence.
(Semantic): Update supported languages.
(Semantic, Hungry Delete, Other C Commands): Fix markup of
commands.
(Misc for Programs): Fix a typo.
(Electric C, Hungry Delete): More accurate description of
mode-line lighters of CC submodes.
(Asm Mode): Add empty lines between @items in a @table.
* doc/emacs/programs.texi (Program Modes): Add a few more modes.
Reported by Michael Albinus <michael.albinus@gmx.de> in
emacs-manual-bugs@gnu.org.
* doc/emacs/msdos.texi (Windows Misc): A minor rewording.
Suggested by Isaac Carter <icarter1391@gmail.com> in
emacs-manual-bugs@gnu.org.
Eli Zaretskii [Wed, 14 Feb 2018 19:00:59 +0000 (21:00 +0200)]
Another set of changes for the manual
* doc/emacs/programs.texi (Program Indent): Add a cross-reference
to elisp's description of 'pp'.
(Program Modes): Add a few more programming modes. Add index
entries.
(Basic Indent, Multi-line Indent, C Indent, Comment Commands)
(Manipulating Comments): Fix markup of keyboard commands.
* doc/emacs/search.texi (Regexps): Add an example with non-ASCII
characters. Suggested by Michael Albinus <michael.albinus@gmx.de>
in emacs-manual-bugs@gnu.org.
* doc/lispref/display.texi (Display Tables): Fix the description
of the 5th extra slot of the display table. (Bug#13473)
Michael Albinus [Wed, 14 Feb 2018 08:28:33 +0000 (09:28 +0100)]
Improvements on tramp.texi
* doc/misc/tramp.texi: Use Tramp version in title. Further
improvements on user option indexing. Finish command examples
with @key{RET} where appropriate.
(Remote processes): Use 'M-&' for invocation of async shell.
(Frequently Asked Questions): Add example with simplified syntax.
Glenn Morris [Tue, 13 Feb 2018 17:26:20 +0000 (09:26 -0800)]
Merge from origin/emacs-26
333d6f4 (origin/emacs-26) More changes in the Emacs manual 52ca0d1 * lisp/vc/vc.el (vc-deduce-backend): Use ignore-errors. 69e8046 Don't signal error in vc-deduce-backend f568c91 * doc/misc/tramp.texi: Index more user options. 92ca881 Minor change in the Emacs manual e055a12 NEWS update about 'string-trim' 96b6e24 Clarify TRAMP process-environment interaction (Bug#30419) 4fa467e * lisp/progmodes/grep.el (grep-num-matches-found): New variable. a22820a Avoid aborts in cm.c due to too small TTY frame 26f6441 Another set of improvements in the Emacs manual cef3b42 Fix help in mode-line-mode-menu f8a493c Improve documentation of desktop restoring 10637af Improve the Emacs manual's chapter "Frames" d924953 Fix unbound mm-uu-entry in mm-uu cb2487b Improve Emacs user manual in fixit.texi 66e9527 Another minor change in the manual 6a1c03d More minor changes in the Emacs manual 32fb8c4 Avoid printing garbled error message from image.el
Eli Zaretskii [Tue, 13 Feb 2018 17:12:37 +0000 (19:12 +0200)]
More changes in the Emacs manual
* doc/emacs/search.texi (Regexp Backslash): Say that
symbol-constituent characters are determined by the syntax table.
(Lax Search): Fix example of case-insensitive search. Fix a
typo.
(Unconditional Replace): Improve wording.
(Regexp Replace): More consistent wording. Reported by Michael
Albinus <michael.albinus@gmx.de> in emacs-manual-bugs@gnu.org.
* doc/emacs/msdos.texi (Windows HOME): Avoid enumerating all the
Windows versions. Reported by Isaac Carter
<icarter1391@gmail.com> in emacs-manual-bugs@gnu.org.
Eli Zaretskii [Tue, 13 Feb 2018 05:59:26 +0000 (07:59 +0200)]
Minor change in the Emacs manual
* doc/emacs/building.texi (Lisp Libraries): Explain why nil in
load-path is not a good idea. Suggested by James Yoo
<james.yoo@gmail.com> in emacs-manual-bugs@gnu.org.
Paul Eggert [Tue, 13 Feb 2018 00:39:56 +0000 (16:39 -0800)]
Work if libpng is in /usr/local (2nd try)
Problem reported by Werner Lemberg in:
https://lists.gnu.org/r/emacs-devel/2018-02/msg00304.html
with a further fix suggested by Glenn Morris in Bug#30431#14.
* configure.ac: Try pkg-config before libpng-config.
Adjust LIBPNG accordingly, and append -lz regardless of
whether it was pkg-config.
* doc/misc/tramp.texi (Remote processes): Index the
tramp-remote-process-environment description. Clarify the effects of
let-binding process-environment and the motivation for that behavior.
Juri Linkov [Mon, 12 Feb 2018 21:39:28 +0000 (23:39 +0200)]
* lisp/progmodes/grep.el (grep-num-matches-found): New variable.
(grep-mode-line-matches): New defconst.
(grep-mode-font-lock-keywords): Update the regexp for “Grep finished”
to include the number of matches found.
(grep-process-setup): Set grep-num-matches-found to 0.
(grep-exit-message): New function with body moved from lambda
in grep-process-setup. Use grep-num-matches-found to return
the number of matches found.
(grep-filter): Increment grep-num-matches-found.
(grep-mode): Set compilation-mode-line-errors to grep-mode-line-matches.
(Bug#30397, bug#14017)
Paul Eggert [Mon, 12 Feb 2018 20:52:44 +0000 (12:52 -0800)]
Finish renaming to internal--daemon-sockname
* doc/lispref/processes.texi (Misc Network): Omit discussion of
internal--daemon-sockname, as non-Emacs code shouldn't rely on it.
* src/process.c (syms_of_process): Rename internal-daemon-sockname
to internal--daemon-sockname. All uses changed.
Paul Eggert [Mon, 12 Feb 2018 20:52:43 +0000 (12:52 -0800)]
Minor cleanups for server-name fix (Bug#24218)
* lisp/server.el (server--external-socket-initialized): Rename
from server-external-socket-initialised, since it should be
private and Emacs uses American spelling. All uses changed.
* src/emacs.c, src/lisp.h: Revert previous changes, as the
initialization is now done in src/process.c, which already
includes the relevant files.
* src/process.c (union u_sockaddr): Move decl to top level.
(external_sock_name, Fget_external_sockname): Remove, replacing
with Vinternal__external_sockname. All uses changed.
(init_process_emacs): Deduce socket name ourselves rather than
have main.c do it. Use conv_sockaddr_to_lisp instead of doing
it by hand. Conditionalize it on HAVE_GETSOCKNAME.
Matthew Leach [Mon, 12 Feb 2018 20:52:43 +0000 (12:52 -0800)]
Fix `server-name' and `server-socket-dir' for (Bug#24218)
* lisp/server.el: (server-external-socket-initialised): New
(server-name): Compute server name from `get-external-sockname'.
(server-socket-dir): Compute socket dir from
`get-external-sockname'.
(server-start): Don't check for existing server when an
uninitialised external socket has been passed to Emacs.
* src/emacs.c: (main): Obtain socket name via getsockname and pass
to `init_process_emacs'.
* src/lisp.h: (init_process_emacs): Add second parameter.
* src/process.c: (external_sock_name): New.
(get-external-sockname): New.
(init_process_emacs): Set `external_sock_name' to `sockname'
parameter.
Eli Zaretskii [Mon, 12 Feb 2018 18:02:36 +0000 (20:02 +0200)]
Avoid aborts in cm.c due to too small TTY frame
* src/frame.c (frame_windows_min_size): Limit TTY frames to a
minimum height large enough to allow for a menu bar, the mode
line, one text line and one echo-area line. This avoids aborts in
cm.c:cmcheckmagic. (Bug#30320)
Eli Zaretskii [Mon, 12 Feb 2018 17:52:48 +0000 (19:52 +0200)]
Another set of improvements in the Emacs manual
* doc/emacs/msdos-xtra.texi (MS-DOS Keyboard):
* doc/emacs/msdos.texi (Windows Keyboard):
* doc/emacs/mark.texi (Using Region):
* doc/emacs/frames.texi (Menu Mouse Clicks):
* doc/emacs/macos.texi (Mac / GNUstep Basics): Fix spelling of
keys. Reported by Michael Albinus <michael.albinus@gmx.de> in
emacs-manual-bugs@gnu.org.
* doc/emacs/glossary.texi (Glossary): Document that "c.f." is a
misspelling. Reported by Robert Pluim <rpluim@gmail.com>.
Various minor wording improvements. Suggested by Toon Claes
<toon@iotcl.com> in emacs-manual-bugs@gnu.org.
More minor changes. Suggested by Michael Albinus
<michael.albinus@gmx.de> in emacs-manual-bugs@gnu.org.
* doc/emacs/basic.texi (Moving Point): Move the description of the
bidi-related effects of the arrow keys from here ...
* doc/emacs/mule.texi (Bidirectional Editing): ... to here.
Explain the behavior of arrow keys between paragraphs.
Paul Eggert [Mon, 12 Feb 2018 15:26:45 +0000 (07:26 -0800)]
Revert libpng /usr/local patch
It broke builds on Arch, Debian, OpenSuSE; see thread containing:
https://lists.gnu.org/r/2018-02/msg00330.html
* configure.ac: Don't try pkg-config; just use libpng-config.
Alan Third [Wed, 7 Feb 2018 22:39:17 +0000 (22:39 +0000)]
Fix modifier keys on NS port
* src/nsterm.m (EV_MODIFIERS_OPTION):
(EV_MODIFIERS_CONTROL):
(EV_MODIFIERS_COMMAND): New macros.
(ev_modifiers_helper): New function.
(EV_MODIFIERS2): Use new helper function.
(EmacsView::keyDown): Remove duplicate functionality and handle fn key
correctly.
Alan Third [Sun, 11 Feb 2018 11:34:49 +0000 (11:34 +0000)]
Remove NS special handling of 'frame-title-format'
* lisp/term/ns-win.el (frame-title-format, icon-title-format): Change
default format to just the filename.
* src/nsfns.m (ns-use-proxy-icon): New variable.
(ns_set_name_as_filename): Remove function.
(x_implicitly_set_name): Get rid of special handling of
frame-title-format.
* src/nsterm.h (ns_set_represented_filename): Use new definition.
* src/nsterm.m (ns_set_represented_filename): Move some of the logic
from ns_set_name_as_filename into this function.
Eli Zaretskii [Sun, 11 Feb 2018 17:59:00 +0000 (19:59 +0200)]
Improve documentation of desktop restoring
* doc/emacs/misc.texi (Saving Emacs Sessions): Document
'desktop-auto-save-timeout', 'desktop-load-locked-desktop', and
how to restore desktop in daemon mode. (Bug#30421)
Eli Zaretskii [Sun, 11 Feb 2018 16:19:25 +0000 (18:19 +0200)]
Improve the Emacs manual's chapter "Frames"
* doc/emacs/frames.texi (Creating Frames): Add a cross-reference
to where frame visibility is described.
(Word and Line Mouse): Clarify wording.
(Scroll Bars): Qualify scroll-bar behavior. Reported by Dmitry
Gutov <dgutov@yandex.ru> in emacs-manual-bugs@gnu.org.
Juri Linkov [Sat, 10 Feb 2018 21:55:34 +0000 (23:55 +0200)]
* lisp/window.el (display-buffer--maybe-at-bottom): New function (bug#30314).
(display-buffer--maybe-pop-up-frame)
(display-buffer--maybe-pop-up-window): New functions created from
display-buffer--maybe-pop-up-frame-or-window.
(display-buffer--maybe-pop-up-frame-or-window): Call
display-buffer--maybe-pop-up-frame or
display-buffer--maybe-pop-up-window.
(display-buffer-at-bottom): Fix parens.
* lisp/minibuffer.el (minibuffer-completion-help): Use
display-buffer--maybe-pop-up-frame instead of let-binding
pop-up-windows to nil.
* lisp/files.el (hack-local-variables-confirm)
(save-buffers-kill-emacs): Use display-buffer--maybe-at-bottom.
Juri Linkov [Sat, 10 Feb 2018 21:46:13 +0000 (23:46 +0200)]
* lisp/comint.el (comint-after-pmark-p): Check if buffer has a live process.
Return nil if not.
(comint-history-isearch-setup): Don't check if process is live.
Always check if shell prompt is empty regardless of the value
of comint-history-isearch. (Bug#30187)
Eli Zaretskii [Sat, 10 Feb 2018 17:21:42 +0000 (19:21 +0200)]
Improve Emacs user manual in fixit.texi
* doc/emacs/fixit.texi (Undo): Clarify inaccurate description of
repeated undo.
(Transpose): Describe explicitly what happens at EOL.
(Spelling): Use "spell-checking" consistently. Clarify wording.
Suggested by Toon Claes <toon@iotcl.com> in
emacs-manual-bugs@gnu.org.
Rami Ylimäki [Sat, 10 Feb 2018 11:31:22 +0000 (13:31 +0200)]
Support standard Terminfo direct mode terminals
Latest Terminfo introduces terminal definitions that support direct
color mode. The "Co"/"colors" capability is set to 0x1000000 on these
terminals and Emacs is already compatible with them.
However, if used Terminfo library hasn't been compiled with 32-bit
value support, "Co"/"colors" is truncated to 0x7fff. In this case
direct color mode support can be detected from the "RGB" capability
flag.
There are some minor problems if the color count isn't corrected from
0x7fff. First eight standard colors defined in xterm-standard-colors
are shown correctly. However, their RGB values match the terminal
settings, not the RGB values defined in xterm-standard-colors. Bright
versions of these colors are shown incorrectly. They are interpreted
as pixels #000008 - #000015, which are very dark shades of blue.
* src/term.c (init_tty): Force terminal color count to 0x1000000 if
"RGB" capability is present.
* src/tparam.h: Define prototype for tigetflag. (Bug#30308)
* doc/misc/efaq.texi (Colors on a TTY): Add information about direct
mode terminals supported by Terminfo.
Martin Rudalics [Sat, 10 Feb 2018 09:18:38 +0000 (10:18 +0100)]
Make tooltip code handle scenarios from Bug#30182 and Bug#30399
Move calculation of the mode line default help echo from
note_mode_line_or_margin_highlight to display_mode_lines
(Bug#30182). Fix cursor type for dragging the mode line.
Normalize FRAME argument of Fx_show_tip before assigning it to
tip_last_frame and handle the transition from GTK+ to Emacs
tooltips and vice-versa in x_hide_tip (Bug#30399).
* src/window.h (struct window): New Lisp member
mode_line_help_echo.
(wset_mode_line_help_echo): New function.
* src/w32fns.c (Fx_show_tip): Normalize the FRAME argument
bevore storing it in tip_last_frame (Bug#30399).
* src/xdisp.c (display_mode_lines): Calculate mode line
default help echo string here and store it in the window's
mode_line_help_echo slot (Bug#30182).
(note_mode_line_or_margin_highlight): Use value in window's
mode_line_help_echo slot as mode line default help echo. When
the window is resizable show a vertical drag cursor instead of
the vertical scroll bar cursor.
* src/xfns.c (x_hide_tip): Rewrite the GTK+ part to correctly
handle the transition from GTK+ system to Emacs tooltips and
vice-versa (Bug#30399).
(Fx_show_tip): Normalize the FRAME argument bevore storing it
in tip_last_frame (Bug#30399).
Michael Albinus [Sat, 10 Feb 2018 08:41:04 +0000 (09:41 +0100)]
Handle "gio monitor" in tramp-sh.el
* lisp/net/tramp-sh.el (tramp-gio-events): New defconst.
(tramp-sh-handle-file-notify-add-watch): Handle "gio monitor" extra.
(tramp-sh-gio-monitor-process-filter)
(tramp-get-remote-gio-monitor): New defuns.
(tramp-sh-gvfs-monitor-dir-process-filter)
(tramp-get-remote-gvfs-monitor-dir): Do not check for gio anymore.
Eli Zaretskii [Sat, 10 Feb 2018 07:51:00 +0000 (09:51 +0200)]
Avoid printing garbled error message from image.el
* lisp/image.el (image--get-imagemagick-and-warn): Don't use
apostrophe in the error message, as that message is shown from a
unibyte buffer, and will run afoul of the default style of showing
quote characters. (Bug#30405)
Glenn Morris [Fri, 9 Feb 2018 19:12:48 +0000 (11:12 -0800)]
Merge from origin/emacs-26
0276743 (origin/emacs-26) Doc string fix in latin-alt.el c9269af Minor improvements in package.texi 898a3e4 Minor improvement in Emacs user manual 8f7d718 * doc/lispref/anti.texi (Antinews): Replace 25.2 with 25.3. 989d0af Improve documentation of mini-window resizing 923e415 More changes in the Emacs manual 565adf2 Clarify that text-quoting-style doesn't affect *Info* (Bug#24... 2dd273b Mention that shell quoting of % on w32 may fail (Bug#19350) 19fa6d5 Fix --no-build-details for w32 and macOS 979944c * doc/lispref/anti.texi (Antinews): Add some more antinews. c2727e3 Fix crashes when run with --no-build-details dc08490 More changes for the manual 04c5bd5 Doc fixes for process functions (Bug#30349) e209034 Fix shr and CSS 4 color maps 5fe8192 Yet another round of improvements in the manual