emacs/src, branch fix/bug-20871 Emacs is the extensible, customizable, self-documenting real-time display editor. Fix an omission in lookup_basic_face 2017-12-04T15:43:35+00:00 Eli Zaretskii 2017-12-04T15:43:35+00:00 42ba2a2e1f212eca2b0bb2b04c65d100da34e171 * src/xfaces.c (lookup_basic_face): Handle 'vertical-border' face as well. (Bug#29557) 
* src/xfaces.c (lookup_basic_face): Handle 'vertical-border' face
as well.  (Bug#29557)
allocate_vectorlike minor cleanup 2017-12-04T02:18:02+00:00 Paul Eggert 2017-12-04T02:17:00+00:00 a597969f1360b8c28fd4467018792662b698e03a * src/alloc.c (allocate_vectorlike): Move a bit of code out of the critical section. Although this doesn’t really help performance, it cleans up the code a bit and should make it easier to add pointer bounds checking. 
* src/alloc.c (allocate_vectorlike): Move a bit of code out of the
critical section.  Although this doesn’t really help performance,
it cleans up the code a bit and should make it easier to add
pointer bounds checking.
Omit exprintf if modules but no X 2017-12-04T02:18:02+00:00 Paul Eggert 2017-12-04T02:11:00+00:00 c54718e0bb390b35d86e8cab7ae1a7d1da9c047c * src/doprnt.c (exprintf): Do not define if HAVE_MODULES && !(have_X_WINDOWS || USE_X_TOOLKIT), as the modules code no longer uses exprintf. 
* src/doprnt.c (exprintf): Do not define if HAVE_MODULES &&
!(have_X_WINDOWS || USE_X_TOOLKIT), as the modules code no longer
uses exprintf.
Pacify GCC on Ubuntu 17.10 x86-64 2017-12-04T02:18:01+00:00 Paul Eggert 2017-12-04T01:58:08+00:00 1dcf8b5ec59ff714b02ccc7466c02a9e6132bcc9 * src/xfns.c (x_real_pos_and_offsets): Pull out parent frame into a local, so that GCC doesn't warn about dereferencing a possibly-null pointer. 
* src/xfns.c (x_real_pos_and_offsets): Pull out parent frame
into a local, so that GCC doesn't warn about dereferencing
a possibly-null pointer.
Add image resizing and rotation to NS port 2017-12-03T22:41:05+00:00 Alan Third 2017-12-03T17:39:03+00:00 e4f2061ebc61168f23c0d9440221cbc99864deae * lisp/image.el (image--get-imagemagick-and-warn): Bypass imagemagick check when using NS. * src/nsimage.m (ns_load_image): Add rotation and resizing functionality. Move the getMetaData call to before the resize/rotation so it returns correct metadata. (EmacsImage::setSizeFromSpec, EmacsImage::rotate): New functions. * src/nsterm.h (EmacsImage): Add new function prototypes. (NSCompositingOperationCopy): Add define to older equivalent for GNUstep and pre-10.12 macOS. * configure.ac: Don't use libjpeg on Cocoa. 
* lisp/image.el (image--get-imagemagick-and-warn): Bypass imagemagick
check when using NS.
* src/nsimage.m (ns_load_image): Add rotation and resizing
functionality. Move the getMetaData call to before the resize/rotation
so it returns correct metadata.
(EmacsImage::setSizeFromSpec, EmacsImage::rotate): New functions.
* src/nsterm.h (EmacsImage): Add new function prototypes.
(NSCompositingOperationCopy): Add define to older equivalent for
GNUstep and pre-10.12 macOS.
* configure.ac: Don't use libjpeg on Cocoa.
Merge from origin/emacs-26 2017-12-03T05:38:05+00:00 Paul Eggert 2017-12-03T05:38:05+00:00 9d7f0e27e0592132c1b5b9c280192333eaf288b8 04e5b28ff1 Fix bug in i18n/l10n optimization 8227087194 Let autoload-compute-prefix be set file-locally (Bug#29471) 98ca7d5f26 Improve edit-kbd-macro prompting in case of remapped keys ... c02c1f6be7 Add tests on electric-indentation and Python multiline str... 946bb6d225 Disable electric indent for python strings (Bug#29305) 35f1ed10e4 ; ChangeLog.2: Fix bug reference. ac316634e4 Fix buffer overflow in fontname conversion (Bug#29523) bf9b972843 Fix byte compilation of files with leading directories ac144dc835 * lisp/files.el (make-backup-file-name-1): Fix scoping error. 1b351c8a47 Revert Tramp commit from 2017-11-20 77cf972592 Improve documentation of buffer-list commands and features 66ec92af00 Fix backing up remote files in local directories on MS-Win... 7e61e74da7 * doc/emacs/mule.texi (Output Coding): Clarify sendmail co... 1e25cd79ff Revert "Fix backing up remote files in local directories o... f52d79500b Fix a typo in ELisp manual bf26fc3656 * lisp/composite.el (find-composition): Fix a typo in the ... 
04e5b28ff1 Fix bug in i18n/l10n optimization
8227087194 Let autoload-compute-prefix be set file-locally (Bug#29471)
98ca7d5f26 Improve edit-kbd-macro prompting in case of remapped keys ...
c02c1f6be7 Add tests on electric-indentation and Python multiline str...
946bb6d225 Disable electric indent for python strings (Bug#29305)
35f1ed10e4 ; ChangeLog.2: Fix bug reference.
ac316634e4 Fix buffer overflow in fontname conversion (Bug#29523)
bf9b972843 Fix byte compilation of files with leading directories
ac144dc835 * lisp/files.el (make-backup-file-name-1): Fix scoping error.
1b351c8a47 Revert Tramp commit from 2017-11-20
77cf972592 Improve documentation of buffer-list commands and features
66ec92af00 Fix backing up remote files in local directories on MS-Win...
7e61e74da7 * doc/emacs/mule.texi (Output Coding): Clarify sendmail co...
1e25cd79ff Revert "Fix backing up remote files in local directories o...
f52d79500b Fix a typo in ELisp manual
bf26fc3656 * lisp/composite.el (find-composition): Fix a typo in the ...
Merge from origin/emacs-26 2017-12-03T05:38:05+00:00 Paul Eggert 2017-12-03T05:38:05+00:00 f1204e1dda84a65d7906949247076c6ba4d4ba40 8c8b673288 Fix backing up remote files in local directories on MS-Win... 8eb6870be6 Fix vertical cursor motion in pixel-scroll.el 625e84f156 Fix typos in doc strings of message.el 9292276a44 Fix a typo in the Emacs manual 42509c0649 Improve the documentation of 'table-insert-sequence' 93dc7ae4a4 Port better to QNX ad99550610 Make tramp-test42-auto-load more robust af0ce33d08 ; * lisp/composite.el (find-composition): Fix a typo in la... bdbcdbac43 Avoid assertions in find-composition 
8c8b673288 Fix backing up remote files in local directories on MS-Win...
8eb6870be6 Fix vertical cursor motion in pixel-scroll.el
625e84f156 Fix typos in doc strings of message.el
9292276a44 Fix a typo in the Emacs manual
42509c0649 Improve the documentation of 'table-insert-sequence'
93dc7ae4a4 Port better to QNX
ad99550610 Make tramp-test42-auto-load more robust
af0ce33d08 ; * lisp/composite.el (find-composition): Fix a typo in la...
bdbcdbac43 Avoid assertions in find-composition
Fix bug in i18n/l10n optimization 2017-12-03T05:32:26+00:00 Paul Eggert 2017-12-03T05:31:24+00:00 04e5b28ff1691345e023a944dc6a6a9e9573bd07 This fixes a off-by-one buffer overrun bug introduced in 2017-06-04T15:39:37Z!eggert@cs.ucla.edu. Problem uncovered by an experimental version of Emacs built with -fcheck-pointer-bounds and running on Intel MPX hardware. * src/editfns.c (styled_format): Avoid overrunning internal buffers. 
This fixes a off-by-one buffer overrun bug introduced in
2017-06-04T15:39:37Z!eggert@cs.ucla.edu.  Problem uncovered by an
experimental version of Emacs built with -fcheck-pointer-bounds
and running on Intel MPX hardware.
* src/editfns.c (styled_format): Avoid overrunning internal buffers.
Fix buffer overflow in fontname conversion (Bug#29523) 2017-12-02T13:45:51+00:00 Yuuki Harano 2017-12-01T19:31:16+00:00 ac316634e4452bcf97ff8ebc5fbabf27337a16dd * src/nsterm.m (ns_xlfd_to_fontname): Fix sscanf format. Copyright-paperwork-exempt: yes 
* src/nsterm.m (ns_xlfd_to_fontname): Fix sscanf format.

Copyright-paperwork-exempt: yes
For help commands, ensure all keys of a mouse sequence are reported. 2017-12-02T10:00:56+00:00 Alan Mackenzie 2017-12-02T10:00:56+00:00 bc092fcaea7268f2339f0e92720a37e62cdca5b2 This solves the problem where read_key_sequence initializes and uses a global buffer raw_keybuf, yet is called recusrsively. The initialization is now done elsewhere, avoiding the reinitialization of that global buffer. * src/keyboard.c (command_loop_1, read_key_sequence_vs): Initialize raw_event_count before calling read_key_sequence. (read_char_x_menu_prompt): Call x_popup_menu_1 in place of Fx_popup_menu. (init_raw_keybuf_count): New function. (read_key_sequence): Remove initialization of raw_event_count. Add a missing GROW_RAW_KEYBUF invocation. * src/keyboard.h: (init_raw_keybuf_count): New declaration. * src/menu.c: (x_popup_menu_1): New function with the functionality of the former Fx_popup_menu. (Fx_popup_menu): Replace with function which initializes raw_event_count then calls x_popup_menu_1. * src/menu.h: (x_popup_menu_1): New declaration. 
This solves the problem where read_key_sequence initializes and uses a global
buffer raw_keybuf, yet is called recusrsively.  The initialization is now done
elsewhere, avoiding the reinitialization of that global buffer.

* src/keyboard.c (command_loop_1, read_key_sequence_vs): Initialize
raw_event_count before calling read_key_sequence.
(read_char_x_menu_prompt): Call x_popup_menu_1 in place of Fx_popup_menu.
(init_raw_keybuf_count): New function.
(read_key_sequence): Remove initialization of raw_event_count.  Add a missing
GROW_RAW_KEYBUF invocation.

* src/keyboard.h: (init_raw_keybuf_count): New declaration.

* src/menu.c: (x_popup_menu_1): New function with the functionality of the
former Fx_popup_menu.
(Fx_popup_menu): Replace with function which initializes raw_event_count then
calls x_popup_menu_1.

* src/menu.h: (x_popup_menu_1): New declaration.