1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-04-26 00:01:47 -07:00
Commit graph

118044 commits

Author SHA1 Message Date
Glenn Morris
da95e2399e Merge from emacs-24; up to 117691 2014-11-08 18:06:29 -08:00
Glenn Morris
e4ed201ff9 Replace doc/*/Makefile.in dist rules with code in admin/admin.el
* admin/admin.el (make-manuals-dist-output-variables)
(make-manuals-dist--1, make-manuals-dist): New.
Replaces doc/*/Makefile.in `dist' rules.

* doc/emacs/Makefile.in (version): Remove variable.
(clean): No longer delete dist tarfile.
(dist): Remove rule; replace with code in admin.el.

* doc/lispintro/Makefile.in (version): Remove variable.
(clean): No longer delete dist tarfile.
(dist): Remove rule; replace with code in admin.el.

* doc/lispref/Makefile.in (version): Remove variable.
(clean): No longer delete dist tarfile.
(dist): Remove rule; replace with code in admin.el.

* doc/misc/Makefile.in (version): Remove variable.
(clean): No longer delete dist tarfile.
(dist): Remove rule; replace with code in admin.el.
2014-11-08 18:02:51 -08:00
l3thal
d1036d288d backport: erc bugfixes 2014-11-08 20:51:43 -05:00
Tassilo Horn
90a1373b4c lisp/gnus/gnus-start.el (gnus-activate-group): Fix typo reported by Tim Landscheidt 2014-11-09 00:48:34 +00:00
Juri Linkov
6f443e47ac * lisp/simple.el (shell-command): Use buffer-name when output-buffer is a buffer.
Fixes: debbugs:18096
2014-11-09 01:52:59 +02:00
Dani Moncayo
8958d7da78 Makefile.in (epaths-force-w32): Ensure that w32srcdir is an absolute path. 2014-11-09 00:33:36 +01:00
Dani Moncayo
a6d74ed37b Revert 118323. 2014-11-09 00:31:44 +01:00
Juri Linkov
0ced1de32c * lisp/minibuffer.el (minibuffer-completion-help): Compare this-command with completion-at-point.
Fixes: debbugs:17809
2014-11-09 00:56:37 +02:00
Juri Linkov
4f9bd422ef etc/NEWS: Mention the feature of query replace pairs. 2014-11-09 00:50:49 +02:00
Glenn Morris
089c6aab18 Merge from emacs-24; up to 117689 2014-11-08 13:32:10 -08:00
Glenn Morris
7d8205619a * bytecomp.el (byte-compile-report-error): Allow the argument to be a string.
Due to the vague doc, it was already being used this way.
2014-11-08 13:29:04 -08:00
Dani Moncayo
e7e61abaa9 build-aux/msys-to-w32: always output absolute paths. 2014-11-08 22:17:00 +01:00
Jan Djärv
d244e9bf03 * nsterm.m (ns_set_vertical_scroll_bar): Don't call bar setPosition: unless
needed (Bug#18757).

Fixes: debbugs:18993
2014-11-08 20:40:17 +01:00
Glenn Morris
929201eab1 doc/misc/Makefile.in: Parallel make fix
* doc/misc/Makefile.in (${buildinfodir}/ccmode.info)
(${buildinfodir}/efaq%.info): Ensure output directory exists.
2014-11-08 11:12:38 -08:00
Glenn Morris
416148257a Merge from emacs-24; up to 117687 2014-11-08 10:21:38 -08:00
Stefan Monnier
97cd730164 * lisp/emacs-lisp/bytecomp.el: Add a warning and remove a spurious warning.
(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 12:46:21 -05:00
Jan Djärv
86b1c771e1 Attempt to fix NS hang. Will probably cause merge conflicts.
* nsterm.m (init): Replace OSX 10.9 check with IMPL_COCOA.
(run): Ditto.  Only use non-system event loop if OSX version is
exactly 10.9.

Fixes: debbugs:18993
2014-11-08 17:32:37 +01:00
Richard M. Stallman
c6bd759465 Make rmail-epa-decrypt handle more ways of formatting the message.
* 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 10:48:13 -05:00
Dani Moncayo
31a57f2215 build-aux/msys-to-w32: Minor doc fixes. 2014-11-08 16:27:34 +01:00
Dani Moncayo
1e1f2237cd Makefile.in (epaths-force-w32): Simplify.
* Makefile.in (epaths-force-w32): Simplify, assuming that the shell is
bash (as is the case in MSYS).
(msys_w32prefix_subst, msys_sed_sh_escape): Remove (no longer used).
2014-11-08 16:18:06 +01:00
Dani Moncayo
7c86a2a7d8 build-aux/msys-to-w32: simplify the initial interface.
* build-aux/msys-to-w32: simplify the initial over-engineered
interface, and the implementation.
* Makefile.in (epaths-force-w32): Update for the above.
2014-11-08 15:55:09 +01:00
Martin Rudalics
c936cbbc83 Run `window-configuration-change-hook' only after all faces have been realized.
* 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.
* faces.el (face-set-after-frame-default): Enable running
`window-configuration-change-hook'.
2014-11-08 12:11:50 +01:00
Michael Albinus
89be8b92a6 Backport Tramp changes from trunk.
* tramp.texi (Inline methods): Remove restriction on "telnet".
Recommend sharing ssh connections for "plink".
(External methods): Remove "sftp".  Merge "pscp" and "psftp"
descriptions.  Recommend sharing ssh connections.  Add "nc" method.
(GVFS based methods): Add "sftp".
(Customizing Completion, External packages, Issues): Use @dots{}.
(Remote shell setup): Explain, how to change command line
arguments of remote "nc" listener.

* trampver.texi: Update release number.
2014-11-08 10:07:24 +01:00
Jan Djärv
a05fd1fc78 * nsterm.m (EmacsScroller.dealloc): Reinstate, removed at merge
cleanup from 2014-11-01.

Fixes: debbugs:18972
2014-11-08 09:47:45 +01:00
Michael Albinus
b03f9b583c Backport Tramp changes from trunk.
* automated/tramp-tests.el (tramp-remote-process-environment):
Declare.
(tramp--test-enabled): Ignore errors.
(tramp--instrument-test-case): Extend docstring.  Print debug
buffer in any case.
(tramp-test15-copy-directory): Skip for tramp-smb.el.
(tramp-test21-file-links): Use `file-truename' for directories.
(tramp-test26-process-file): Extend test according to Bug#17815.
(tramp-test27-start-file-process, tramp-test28-shell-command):
Retrieve process output more robustly.
(tramp-test29-vc-registered): Set $BZR_HOME.
(tramp--test-check-files): Extend test with `substitute-in-file-name'.
(tramp-test30-special-characters): Skip for tramp-adb.el,
tramp-gvfs.el and tramp-smb.el.  Add further file names.
2014-11-08 09:46:20 +01:00
Juri Linkov
2b513c3b1c * lisp/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

* lisp/isearch.el (isearch-text-char-description): Keep characters
intact and put formatted strings with the `display' property.
2014-11-08 01:33:41 +02:00
Michael Albinus
121ccd275a * net/tramp.el (tramp-check-cached-permissions): Include hop in
the constructed Tramp file name.

Fixes: debbugs:18943
2014-11-07 21:15:46 +01:00
Michael Albinus
499a7f1cdb * callproc.c (encode_current_directory): Encode dir at the end. 2014-11-07 21:09:34 +01:00
Stefan Monnier
06ee88e490 * lisp/emulation/cua-base.el (cua--select-keymaps): Use region-active-p.
(cua-set-mark, cua--pre-command-handler-1,cua--post-command-handler-1):
* lisp/emulation/cua-gmrk.el (cua-cancel-global-mark): Same.

Fixes: debbugs:18952
2014-11-07 14:55:39 -05:00
Glenn Morris
2a1f6afdfe * src/callproc.c (encode_current_directory): Fix thinko in previous. 2014-11-07 09:04:10 -08:00
Stefan Monnier
3946aeb962 * src/keyboard.c: Call gui-set-selection instead of x-set-selection.
* src/xdisp.c (window-scroll-functions): Improve docstring.
2014-11-07 11:25:35 -05:00
Paul Eggert
0e44a2d233 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 07:40:06 -08:00
Katsumi Yamaoka
0565d1fb52 doc/misc/gnus.texi (HTML): Fix xref to EWW 2014-11-07 14:51:05 +00:00
Michael Albinus
5282dec1ec * callproc.c (encode_current_directory): Support handling of file
names prepended by "/:".

Fixes: debbugs:18891
2014-11-07 15:45:34 +01:00
Michael Albinus
fd16108130 * 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.

Fixes: debbugs:18891
2014-11-07 15:42:51 +01:00
Martin Rudalics
1c50b3adb6 Improve inhibiting of implied frame resizes.
* frames.texi (Size and Position): Rewrite description of
`frame-inhibit-implied-resize'.
* cus-start.el (frame-resize-pixelwise): Fix group.
(frame-inhibit-implied-resize): Add entry.
* 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-07 11:49:22 +01:00
Tassilo Horn
a067ef9a5d doc/misc/{gnus.texi,gnus-faq.texi}: Add link to EWW manual
* gnus.texi (HTML): Update section so that it mentions shr and w3m.
Also link the full EWW manual that explains more on shr, too.

* gnus-faq.texi (FAQ 4 - Reading messages, FAQ 4-16): Add Q&A on how to
increase contrast when displaying HTML mail with shr.
2014-11-07 10:48:25 +00:00
Eli Zaretskii
cd4776ba26 doc/misc/eww.texi: Fix a typo and improve wording of last commit. 2014-11-07 10:59:00 +02:00
Tassilo Horn
9a51ab3848 Backport from trunk documentation of shr-color-visible-* variables.
doc/misc/eww.texi (Advanced): Document increasing contrast with
 shr-color-visible-distance-min and shr-color-visible-luminance-min.
2014-11-07 10:54:50 +02:00
Tassilo Horn
361ffe1324 Document how to increase contrast in EWW/shr
* doc/misc/eww.texi (Advanced): Document increasing contrast with
shr-color-visible-distance-min and
shr-color-visible-luminance-min.
2014-11-07 08:39:00 +01:00
Daiki Ueno
b912aed95a epg: Utilize --pinentry-mode added in GnuPG 2.1
* 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 15:12:40 +09:00
Daiki Ueno
dbae12c5df epg: Adjust to GnuPG 2.1 key listing change
* epg.el (epg--list-keys-1): Ignore fields after the 15th field
(bug#18979).  Reported by Hideki Saito.

Backported from trunk.
2014-11-07 13:16:26 +09:00
Daiki Ueno
135a9f4b5a epg: Adjust to GnuPG 2.1 key listing change
* epg.el (epg--list-keys-1): Ignore fields after the 15th field
(bug#18979).  Reported by Hideki Saito.
2014-11-07 11:31:12 +09:00
Alan Mackenzie
10c5eacef0 * src/syntax.c (back_comment): Fix off-by-one error.
Fixes: debbugs:18022
2014-11-06 09:05:58 -05:00
Daiki Ueno
55ea575e13 package.el: Fix the last commit 2014-11-06 15:29:24 +09:00
Daiki Ueno
4cd90e0920 package.el: Display output sent to stderr, when verification failed
* emacs-lisp/package.el (package--display-verify-error): New function.
(package--check-signature): Use it to display output sent to stderr.
2014-11-06 12:44:52 +09:00
Daiki Ueno
f374845f4c epg: Fix the last commit
* epg.el (epg-context): Initialize ERROR-OUTPUT as "" instead of nil.
2014-11-06 12:40:03 +09:00
Stefan Monnier
577ef0bc58 * lisp/subr.el (pop): Don't call the getter twice.
Fixes: debbugs:18968
2014-11-05 22:27:23 -05:00
Stefan Monnier
4d5468e529 * lisp/emacs-lisp/macroexp.el (macroexp--expand-all): Optimize away trivial
uses of `funcall'.
2014-11-05 22:16:41 -05:00
Daiki Ueno
9e48a95cf2 epg: Improve error handling
* 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-06 12:04:22 +09:00