From: Glenn Morris Date: Sat, 8 Nov 2014 18:21:38 +0000 (-0800) Subject: Merge from emacs-24; up to 117687 X-Git-Tag: emacs-25.0.90~2635^2~535 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=416148257afedb97bbe6d732eea3a0c72473dab0;p=emacs.git Merge from emacs-24; up to 117687 --- 416148257afedb97bbe6d732eea3a0c72473dab0 diff --cc lisp/ChangeLog index a67f9220bbb,e03e05c46f8..ab12e064aaa --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@@ -1,116 -1,52 +1,152 @@@ -2014-11-07 Michael Albinus ++2014-11-08 Michael Albinus + + * net/tramp.el (tramp-check-cached-permissions): Include hop in + the constructed Tramp file name. (Bug#18943) + -2014-11-07 Stefan Monnier ++2014-11-08 Stefan Monnier + + * emulation/cua-base.el (cua--select-keymaps): Use region-active-p + (bug#18952). - (cua-set-mark, cua--pre-command-handler-1,cua--post-command-handler-1): ++ (cua-set-mark, cua--post-command-handler-1): + * emulation/cua-gmrk.el (cua-cancel-global-mark): Same. + -2014-11-07 Michael Albinus ++2014-11-08 Michael Albinus + + * files.el (file-name-non-special): Wrap the call of + `insert-file-contents' by `unwind-protect', in order to set the + buffer's file name anyway. (Bug#18891) + -2014-11-07 Daiki Ueno - - * epg.el (epg--list-keys-1): Ignore fields after the 15th field - (bug#18979). Reported by Hideki Saito. - -2014-10-18 Alan Mackenzie - - Check that a "macro" found near point-min isn't a ## operator. - Fixes bug #18749. Backported from trunk, 2014-11-05. - * progmodes/cc-engine.el (c-macro-is-genuine-p): New function. - (c-beginning-of-macro): Use the above new function. - -2014-11-05 Alan Mackenzie ++2014-11-08 Alan Mackenzie + + Fix wrong bound to c-font-lock-declarators. Fixes bug #18948. + * progmodes/cc-fonts.el (c-font-lock-declarations): Pass + "(point-max)" as bound to c-font-lock-declarators, not "limit", as + the buffer is sometimes narrowed to less than "limit" (e.g., in + the presence of macros). + -2014-11-05 Michael Albinus ++2014-11-08 Michael Albinus + + * net/tramp.el (tramp-error-with-buffer): Show connection buffer + only when message appeared in minibuffer. (Bug#18891) + + * net/tramp-adb.el (tramp-adb-handle-file-attributes): + * net/tramp-gvfs.el (tramp-gvfs-handle-file-attributes): + * net/tramp-sh.el (tramp-sh-handle-file-attributes): Return nil in + case of errors. + -2014-11-04 Eli Zaretskii +2014-11-08 Stefan Monnier + + * emacs-lisp/bytecomp.el (byte-compile-initial-macro-environment): + Don't compile before eval in `eval-and-compile'. + (byte-compile-arglist-warn): Add check for defining macros after their + first use. Check call use even if the function is fboundp. + +2014-11-08 Richard Stallman + + * mail/rmail.el (rmail-epa-decrypt): Detect armor with line prefixes. + Check more carefully for mime-part specified character set. + Check for mime-part Content Transfer Encoding. + Notify if no armor found. + +2014-11-08 Martin Rudalics + + * faces.el (face-set-after-frame-default): Enable running + `window-configuration-change-hook'. + +2014-11-07 Juri Linkov + + * replace.el: History for query replace pairs. + (query-replace-defaults): Promote to a list of cons cell. Doc fix. + (query-replace-from-to-separator): New variable. + (query-replace-read-from): Let-bind query-replace-from-to-history + to a list of FROM-TO strings created from query-replace-defaults + and separated by query-replace-from-to-separator. Use it as + the history while reading from the minibuffer. Split the returned + string by the separator to get FROM and TO parts, and add them + to the history variables. + (query-replace-read-to): Add FROM-TO pairs to query-replace-defaults. + (query-replace-regexp-eval): Let-bind query-replace-defaults to nil. + http://lists.gnu.org/archive/html/emacs-devel/2014-11/msg00253.html + + * isearch.el (isearch-text-char-description): Keep characters + intact and put formatted strings with the `display' property. + +2014-11-07 Martin Rudalics + + * cus-start.el (frame-resize-pixelwise): Fix group. + (frame-inhibit-implied-resize): Add entry. + +2014-11-07 Daiki Ueno + + * epa.el (epa-pinentry-mode): New user option. + (epa-sign-file, epa-encrypt-file, epa-decrypt-region) + (epa-sign-region, epa-encrypt-region): Respect epa-pinentry-mode. + * epa-file.el (epa-file-insert-file-contents) + (epa-file-write-region): Respect epa-pinentry-mode. + +2014-11-07 Daiki Ueno + + * epg.el (epg--list-keys-1): Ignore fields after the 15th field + (bug#18979). Reported by Hideki Saito. + +2014-11-06 Daiki Ueno + + * emacs-lisp/package.el (package--display-verify-error): New function. + (package--check-signature): Use it to display output sent to stderr. + +2014-11-06 Stefan Monnier + + * subr.el (pop): Don't call the getter twice (bug#18968). + + * emacs-lisp/macroexp.el (macroexp--expand-all): Optimize away trivial + uses of `funcall'. + +2014-11-06 Daiki Ueno + + * epa.el (epa-error-buffer): New variable. + (epa-display-error): New function. + (epa-decrypt-file, epa-verify-file, epa-verify-region) + (epa-delete-keys, epa-import-keys): Display output sent to stderr. + (epa-sign-file, epa-sign-region, epa-encrypt-region) + (epa-export-keys, epa-insert-keys): Display output sent to stderr. + Use setf instead of epg-context-set-*. + * epa-file.el (epa-file-insert-file-contents): + Use epa-display-error instead of epa-display-info. Mimic the behavior + of jka-compr when decryption program is not found. + (epa-file-write-region): Use epa-display-error instead of + epa-display-info. + +2014-11-05 Stefan Monnier + + * vc/vc.el (vc-region-history): New command. + (vc-print-log-internal): Use cl-some. + + * vc/vc-git.el (vc-git-region-history): New function. + (vc-git-region-history-mode-map) + (vc-git--log-view-long-font-lock-keywords) + (vc-git-region-history-font-lock-keywords): New vars. + (vc-git-region-history-font-lock): New function. + (vc-git-region-history-mode): New major mode. + +2014-11-05 Tassilo Horn + + * net/eww.el (subr-x): Require subr-x at compile-time because eww + uses string-trim. + +2014-11-05 Daiki Ueno + + * epg.el (epg-context): Add new slot ERROR-OUTPUT. + (epg-error-output): New buffer-local variable. + (epg--start): Initialize epg-error-output. + (epg--process-filter): Record output lines sent to stderr, in + epg-error-output. + (epg-wait-for-completion): Copy epg-error-output to ERROR-OUTPUT + slot of context. + * epa-file.el (epa-file-insert-file-contents): On error, display + output sent to stderr. + (epa-file-write-region): Likewise. + +2014-11-05 Eli Zaretskii * jit-lock.el (jit-lock-stealth-fontify): Be tolerant to nil being returned by load-average. diff --cc lisp/progmodes/cc-fonts.el index 1c389bc3665,6ebd6c6a8fc..8035c1891d7 --- a/lisp/progmodes/cc-fonts.el +++ b/lisp/progmodes/cc-fonts.el @@@ -1485,9 -1507,9 +1487,9 @@@ casts and declarations are fontified. (goto-char (match-end 0)) (c-forward-syntactic-ws)) ;; At a real declaration? - (if (memq (c-forward-type t) '(t known found)) + (if (memq (c-forward-type t) '(t known found decltype)) (progn - (c-font-lock-declarators limit t is-typedef) + (c-font-lock-declarators (point-max) t is-typedef) nil) ;; False alarm. Return t to go on to the next check. (goto-char start-pos) diff --cc src/ChangeLog index f8ed3b36dde,1544df0da8c..e3f34e27dfc --- a/src/ChangeLog +++ b/src/ChangeLog @@@ -1,98 -1,27 +1,121 @@@ + 2014-11-08 Jan Djärv + - * nsterm.m (init): Replace OSX 10.9 check with IMPL_COCOA. - (run): Ditto. Only use non-system event loop if OSX version is ++ * nsterm.m (run): Only use non-system event loop if OSX version is + exactly 10.9 (Bug#18993). + -2014-11-07 Michael Albinus ++2014-11-08 Michael Albinus + + * callproc.c (encode_current_directory): Support handling of file + names prepended by "/:". (Bug#18891) + -2014-11-06 Alan Mackenzie ++2014-11-08 Alan Mackenzie + + * syntax.c (back_comment): Fix off-by-one error (bug#18022). + -2014-11-06 Dima Kogan ++2014-11-08 Dima Kogan + + * xgselect.c (xg_select): Use g_main_context_acquire (bug#18861). + -2014-11-05 Michael Albinus ++2014-11-08 Michael Albinus + + * dired.c (Ffile_attributes): Return Qnil, if Fexpand_file_name + raises an error. (Bug#18891) + +2014-11-08 Martin Rudalics + + * frame.c (adjust_frame_size): Call x_set_window_size only if + f->can_x_set_window_size is set. + (make_frame): Initialize f->can_x_set_window_size and + f->can_run_window_configuration_change_hook. + (Fcan_run_window_configuration_change_hook): New function. + * frame.h (frame): Split `official' into `can_x_set_window_size' + and `can_run_window_configuration_change_hook'. + * nsfns.m (Fx_create_frame): Set f->can_x_set_window_size. + * w32fns.c (Fx_create_frame, x_create_tip_frame): Set + f->can_x_set_window_size. + * window.c (run_window_configuration_change_hook): Return + immediately if either f->can_x_set_window_size or + f->can_run_window_configuration_change_hook are false. + (Fset_window_configuration): Instead of f->official set + f->can_x_set_window_size. + * xfns.c (Fx_create_frame, x_create_tip_frame): Set + f->can_x_set_window_size. + +2014-11-08 Jan Djärv + + * nsterm.m (EmacsScroller.dealloc): Reinstate, removed at merge + cleanup from 2014-11-01 (Bug#18972). + +2014-11-07 Stefan Monnier + + * keyboard.c: Call gui-set-selection instead of x-set-selection. + * xdisp.c (window-scroll-functions): Improve docstring. + +2014-11-07 Paul Eggert + + Uniquify the 'size' symbol. + * frame.c (Qsize): + * w32notify.c (Qsize): Remove. + * lisp.h (Qsize): New decl. + * lread.c (Qsize): Now extern. + * w32notify.c (syms_of_w32notify): No need to defsym. + +2014-11-07 Martin Rudalics + + * dispnew.c (change_frame_size_1): Fix call of + adjust_frame_size. + * frame.c (Qsize, Qframe_position, Qframe_outer_size) + (Qframe_inner_size, Qexternal_border_size, Qtitle_height) + (Qmenu_bar_external, Qmenu_bar_size, Qtool_bar_external) + (Qtool_bar_size): New constants. + (frame_inhibit_resize, adjust_frame_size): New argument to + handle case where frame_inhibit_implied_resize is a list. + (Fmake_terminal_frame, Fset_frame_height, Fset_frame_width) + (Fset_frame_size, x_set_left_fringe, x_set_right_fringe) + (x_set_right_divider_width, x_set_bottom_divider_width) + (x_set_vertical_scroll_bars, x_set_horizontal_scroll_bars) + (x_set_scroll_bar_width, x_set_scroll_bar_height): + Update callers. + (frame-inhibit-implied-resize): Rewrite doc-string. + * frame.h (frame_inhibit_resize, adjust_frame_size): + Fix external declarations. + (Qframe_position, Qframe_outer_size) + (Qframe_inner_size, Qexternal_border_size, Qtitle_height) + (Qmenu_bar_external, Qmenu_bar_size, Qtool_bar_external) + (Qtool_bar_size): Extern them. + * gtkutil.c (FRAME_TOTAL_PIXEL_HEIGHT, FRAME_TOTAL_PIXEL_WIDTH) + (xg_height_or_width_changed): Remove. + (xg_frame_set_char_size): Adjust adjust_frame_size calls. + (menubar_map_cb, xg_update_frame_menubar, free_frame_menubar) + (tb_size_cb, update_frame_tool_bar, free_frame_tool_bar) + (xg_change_toolbar_position): Call adjust_frame_size directly. + * nsfns.m (x_set_internal_border_width, Fx_create_frame): + Fix calls of adjust_frame_size. + * w32fns.c (x_set_internal_border_width, x_set_menu_bar_lines) + (Fx_create_frame, x_create_tip_frame): Adjust adjust_frame_size calls. + (x_set_tool_bar_lines, x_change_tool_bar_height): Make sure that + frame can get resized when tool-bar-lines parameter changes from + or to zero. + (Fw32_frame_menu_bar_size): Return fourth value. + (Fw32_frame_rect): Block input around system calls + (Fx_frame_geometry): New function. + * w32menu.c (set_frame_menubar): Adjust adjust_frame_size call. + * w32term.c (x_new_font): Adjust adjust_frame_size call. + * widget.c (EmacsFrameSetCharSize): Adjust frame_inhibit_resize call. + * window.c (Fset_window_configuration): Adjust adjust_frame_size call. + * xfns.c (x_set_menu_bar_lines, x_set_internal_border_width) + (Fx_create_frame): Adjust adjust_frame_size calls. + (x_set_tool_bar_lines, x_change_tool_bar_height): Make sure that + frame can get resized when tool-bar-lines parameter changes from + or to zero. + (Fx_frame_geometry): New function. + * xmenu.c (update_frame_menubar): On Lucid call + adjust_frame_size with one pixel less height to avoid that + repeatedly adding/removing the menu bar grows the frame. + (free_frame_menubar): On Motif arrange to optionally preserve + the old frame height when removing the menu bar. + * xterm.c (x_new_font): Adjust adjust_frame_size call. + 2014-11-03 Eli Zaretskii * xdisp.c (Fdump_glyph_matrix, Fdump_frame_glyph_matrix): Doc fix. diff --cc src/callproc.c index e3dcc7bbcca,21741ad8740..24b88551851 --- a/src/callproc.c +++ b/src/callproc.c @@@ -127,11 -150,16 +127,19 @@@ encode_current_directory (void dir = expand_and_dir_to_file (dir, Qnil); + if (NILP (Ffile_accessible_directory_p (dir))) + report_file_error ("Setting current directory", + BVAR (current_buffer, directory)); + + /* Remove "/:" from dir. */ + if (! NILP (Fstring_match (build_string ("^/:"), dir, Qnil))) + dir = Fsubstring (dir, make_number (2), Qnil); + if (STRING_MULTIBYTE (dir)) dir = ENCODE_FILE (dir); + if (! file_accessible_directory_p (dir)) + report_file_error ("Setting current directory", + BVAR (current_buffer, directory)); RETURN_UNGCPRO (dir); } diff --cc src/nsterm.m index c8ad50ef339,190698db1fe..216678357e7 --- a/src/nsterm.m +++ b/src/nsterm.m @@@ -4501,37 -4466,37 +4501,37 @@@ ns_term_shutdown (int sig #ifdef NS_IMPL_COCOA - (void)run { - #ifndef NSAppKitVersionNumber10_8 - #define NSAppKitVersionNumber10_8 1187 + #ifndef NSAppKitVersionNumber10_9 + #define NSAppKitVersionNumber10_9 1265 #endif - if (NSAppKitVersionNumber <= NSAppKitVersionNumber10_8) - { - [super run]; - return; - } + if ((int)NSAppKitVersionNumber != NSAppKitVersionNumber10_9) + { + [super run]; + return; + } - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - if (isFirst) [self finishLaunching]; - isFirst = NO; + if (isFirst) [self finishLaunching]; + isFirst = NO; - shouldKeepRunning = YES; - do - { - [pool release]; - pool = [[NSAutoreleasePool alloc] init]; - - NSEvent *event = - [self nextEventMatchingMask:NSAnyEventMask - untilDate:[NSDate distantFuture] - inMode:NSDefaultRunLoopMode - dequeue:YES]; - [self sendEvent:event]; - [self updateWindows]; + shouldKeepRunning = YES; + do + { + [pool release]; + pool = [[NSAutoreleasePool alloc] init]; + + NSEvent *event = + [self nextEventMatchingMask:NSAnyEventMask + untilDate:[NSDate distantFuture] + inMode:NSDefaultRunLoopMode + dequeue:YES]; + [self sendEvent:event]; + [self updateWindows]; } while (shouldKeepRunning); - [pool release]; + [pool release]; } - (void)stop: (id)sender diff --cc src/xgselect.c index bf889a90e97,6b22f3d1376..4e2d1c8db69 --- a/src/xgselect.c +++ b/src/xgselect.c @@@ -53,9 -53,10 +53,10 @@@ xg_select (int fds_lim, fd_set *rfds, f int have_wfds = wfds != NULL; GPollFD gfds_buf[128]; GPollFD *gfds = gfds_buf; - int gfds_size = sizeof gfds_buf / sizeof *gfds_buf; + int gfds_size = ARRAYELTS (gfds_buf); int n_gfds, retval = 0, our_fds = 0, max_fds = fds_lim - 1; - int i, nfds, tmo_in_millisec; + bool context_acquired = false; + int i, nfds, tmo_in_millisec = -1; bool need_to_dispatch; USE_SAFE_ALLOCA;