1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-02 11:21:42 +00:00
Commit Graph

66774 Commits

Author SHA1 Message Date
Paul Eggert
a11756ad0e Spelling fixes 2016-04-03 23:17:09 -07:00
John Wiegley
0695108b9e Revert "Add r'/l' grep command history commands"
This reverts commit a32eea60ac.
2016-04-03 15:46:53 -07:00
John Wiegley
3a5f146e5a Revert "Restore the point in grep buffers when traversing the history"
This reverts commit f7c5f79ca5.
2016-04-03 15:46:52 -07:00
Paul Eggert
b1c7207dbb Merge from origin/emacs-25
b787d55 More format-time-string change fixups
13c8f29 make-xwidget unused arg cleanup
36e05f0 Remove unused arguments from make-xwidget
1042217 Document incompatible changes in 'format-time-string'
7228eb8 Improve documentation of byte-code objects
0020047 Adapt calls to 'format-time-string' to changes in Emacs 25
17b5152 Improve vc-diff with Git backend
c28f87a (js--continued-expression-p): Special-case unary plus and minus
2d02a5f ; * lisp/vc/vc-annotate.el (vc-annotate): Clarify commentary.
9151f16 Prevent C++ Mode wrongly fontifying some identifiers near tem...
b3b523c Avoid crashes due to insanely large columns in tabulated-list...
a3daa34 Teach M-x disassemble a default argument.
e30c3e9 Fix EOL decoding in vc-annotate with SVN back-end on MS-Windows
df441b3 Fix OS X specific settings in tramp-tests
2244331 Finish fixing a cacheing bug in CC Mode (see 2016-03-09)

# Conflicts:
#	lisp/net/tramp-sh.el
#	lisp/progmodes/cc-engine.el
2016-04-03 13:39:52 -07:00
Lars Magne Ingebrigtsen
f7c5f79ca5 Restore the point in grep buffers when traversing the history
* lisp/progmodes/grep.el (grep-process-setup): Allow moving
point to a specific place after finishing the grep command.
(grep-mode): Use it to restore point after traversing the history.
(grep--history-point): New internal variable.
(grep--save-history, grep-forward-history): Use it to restore
the point.
2016-04-03 20:13:52 +02:00
Lars Magne Ingebrigtsen
a32eea60ac Add r'/l' grep command history commands
* doc/emacs/building.texi (Grep Searching): Mention the
`r'/`l' commands.

* lisp/progmodes/grep.el (grep-forward-history): New command.
(grep-backward-history): Ditto.
(grep--save-buffers): New function.
(grep): Use it to record the history.
(grep--command-history, grep--history-inhibit)
(grep--history-place): New internal variables for the grep
history (bug#22627).
2016-04-03 19:46:58 +02:00
Michael Albinus
1b33cd8e7e Fix Bug#23186, again
* lisp/net/tramp.el (tramp-encoding-shell)
(tramp-encoding-command-switch)
(tramp-encoding-command-interactive): Check for
`w32-shell-name'.  (Bug#23186)
2016-04-03 17:54:25 +02:00
Michael Albinus
7575ba254c Fix Bug#23186
* lisp/net/tramp.el (tramp-encoding-command-switch)
(tramp-encoding-command-interactive):
* lisp/net/tramp-sh.el (tramp-maybe-open-connection):
`tramp-encoding-shell' could be nil.  (Bug#23186)
2016-04-03 10:18:40 +02:00
Michael Albinus
7032e03d60 Fix Bug#22145
* lisp/net/tramp-cache.el (tramp-get-connection-property)
(tramp-set-connection-property, tramp-connection-property-p)
(tramp-flush-connection-property): Improve docstring.

* lisp/net/tramp-sh.el (tramp-maybe-open-connection): Use it.

* lisp/net/tramp.el (tramp-get-local-locale): New defun.

* test/automated/tramp-tests.el (tramp--test-utf8):
Improve settings of coding systems.  (Bug#22145)
2016-04-03 10:14:56 +02:00
Paul Eggert
b787d5501b More format-time-string change fixups
* lisp/net/tramp-sh.el (tramp-sh-handle-set-file-times):
* lisp/org/org.el (org-timestamp-format):
Fix doc to match new format-time-string behavior.
* lisp/org/ox-icalendar.el (org-icalendar-convert-timestamp):
Use (not (not X)) to treat non-nil values of utc arg as UTC.
2016-04-02 23:44:18 -07:00
Joakim Verona
36e05f0bf7 Remove unused arguments from make-xwidget
The arguments BEG and END were unused, and are now removed.

* display.texi (Xwidgets): Document the change
* xwidget.el (make-xwidget, xwidget-insert)
(xwidget-webkit-new-session): Reflect changed arguments
* xwidget.c (Fmake_xwidget, syms_of_xwidget): Reflect changed arguments
2016-04-02 18:32:13 -07:00
John Wiegley
3d88977361 Merge from origin/emacs-25
7c1802f * doc/lispref/text.texi (Columns): Remove a nonexistent refer...
9034c50 * doc/man/emacsclient.1: Document +line:column option.
06495c9 Fix rare problems with echo-area display and multiple frames
f99b512 In M-%, avoid making buffer-local binding of text-property-de...
2016-04-02 14:51:33 -07:00
John Wiegley
c558890bde Merge from origin/emacs-25
e65c307 * src/font.c (QCuser_spec): Add missing colon to :user-spec.
c8b868b Don't start the 'midnight' timer twice
278c8a7 * src/xwidget.c (Fxwidget_resize): Fix inappropriate use of X...
e5c17f4 Fix todo-mode category movement
bc70fda * lisp/xt-mouse.el (xterm-mouse-utf-8): Add :version.
cf40f38 Ignore non-nil. non-cons values of unread-command-events
8ee4c52 Improve documentatuon of 'truncate-partial-width-windows'
fb9a62c * src/ftfont.c (ftfont_shape_by_flt): Parenthesize as per GNU...
1e1ea22 Fix 'dired-goto-file' in Dired buffers produced by find-dired
3a13472 Fix map-put and map-delete for alists (Bug#23105)
422c3da Minor copyedits of documentation for temporary displays
90fb9b3 Add customization option for using UTF-8 coordinates in xt-mouse
f14d463 Minor doc string fixes in replace.el
e70ee9d Fix scrolling upwards with 'xwidget-webkit-browse-url'
44782de Fix display of Indic scripts
326c64f Fix splash screen display at startup
7ab2a97 ; In NEWS mention new display of minibuffer completions window
a1cd84c Describe temporary displays in Emacs manual
5ec1056 Avoid stray As next to IDLW icons
45577d5 Avoid GTK 3 crash with icons and masks
e99ff6e * lisp/minibuffer.el (minibuffer-completion-help): Use fit-wi...
077b78c Define make_save_ptr_ptr unconditionally
20a1003 Preserve current buffer when popping up TTY menus
7eba90c Improve font selection by family on MS-Windows
73d213f Comint, term, and compile now set EMACS
9524ec5 Ignore more merges when generating ChangeLog
ad250f2 Sync with gnulib
c0165ea Resurrect GNUS-NEWS autogeneration
1e5327c ; Backport ChangeLog.2 fixes from master
e643977 Make `toggle-frame-maximized' respect the dock on OS X (bug#2...
38a43f1 Fix bug in displaying header line with a box face
91e6676 Fix an Isearch var to be a string (Bug#23038)
76ef522 Fix (args-out-of-range 1) error in cursor-sensor--detect
8a35f83 Render empty <ul><li><ul> correctly
d8b2ce5 Ignore invalid base64 encoded embedded images
52ba24b Fix <p> and <div> newlines with or without <li> in shr
b8ea08b Avoid errors in 'newline'
fc3cd53 Fix Bug#23032
dd2737b Adjudicate review comments in abbrevs.texi
26f9c50 Fixup the "normal" matcher; highlight global var symbols, too
413e73b ; Small theme additions
cd950da Honor prefix arg in doc-view-next-line-or-next-page
ed909c0 ; Spelling fixes
6da3a6d Port to strict C99 offsetof
de7601f Port to GTK with strict C11 compiler
658aa2d Port to GTK with strict C99 compiler
1df7173 Avoid screen artifacts with new OS X visible bell after scrol...
7a2edd3 Merge branch 'emacs-25' of git.sv.gnu.org:/srv/git/emacs into...
dca240a Suppress some Tramp tests for OSX, do not merge with master
9094304 * lisp/progmodes/xref.el (xref-buffer-name, xref--window): Mo...
cbedfc2 * lisp/gnus/mm-decode.el (gnus-format-message): Autoload it.
005ac7c * lisp/mail/rmail.el (rmail-mime-entity-truncated): Declare.
9ab03f2 ; Auto-commit of loaddefs files.
56df617 Address compilation warnings due to 2016-01-03 mml refactoring.
a1ef911 * lisp/emacs-lisp/smie.el (smie-indent-keyword): Don't burp i...
79ae7fb * lisp/dired-x.el (dired-omit-here-always): Correct error mes...
253929f * lisp/dired-x.el (dired-omit-here-always): Replace undefined...
ce53389 * lisp/xml.el (xml-parse-tag-1): Replace undefined function.
d6d164f Avoid segfaults due to frame image cache being absent
bc7f6f6 Improve documentation of glyphless-character display
6b6916e ; * src/xdisp.c (with_echo_area_buffer): Fix typos in comments.
ee9a1f7 Support safe navigation operator in non-SMIE indentation code
c3ed95b Move xsd:base64Binary decoding fix to debbugs.el 0.9.1
2036be4 Fix Ruby's operator precedence
1d686c2 (ruby-interpolation-inside-another-interpolation): New failin...
7950e1d Port to clang 3.7.0 on x86-64
218ae59 * test/automated/package-test.el (package-test-signed): Tweak...
ba33b7c Sync with gnulib
38b276d Fix startup of "emacs -nw" on systems that CANNOT_DUMP
dbfbedd Do not tokenize a comment before continuation as ';'
0403620 Don't misindent arguments of a method call inside continuation
e6776f8 * src/keyboard.c (echo_keystrokes_p): Don't test cursor_in_ec...
8475f3d ASCII-only etc/NEWS etc.
5cc6919 Fix a cacheing bug, which led to inordinately slow c-beginnin...
0ce37ea Fix Isearch prompt when invoked with an argument
f3033d4 Fix a typo in the Emacs manual
4235d2d Curved quotes in etc/NEWS etc.
26b56dc Fix some single quotes in documentation
80ec484 Make lisp-completion-at-point's argument optional
9d463ae Tweak the left precedence of '=>'
5b705bc Indent '.' relative to the first sibling expression
04f5525 Make '.' associative, for easier sexp navigation
ba24c99 Revert "Simplify "Visit New File" to "New File""
2016-04-02 14:51:33 -07:00
Stefan Monnier
52c7b770d5 * lisp/erc/erc-backend.el: Use lexical-binding. Silence byte-compiler
Use #' to quote functions.
(erc-server-delayed-reconnect): Remove unused arg `event'.
(erc-process-sentinel-2): Adjust accordingly.
Don't pass `err' to condition-case if we don't use it.
(define-erc-response-handler): Use add-hook rather than add-to-list.
(NICK): Use cl-pushnew rather than add-to-list.
(331): Remove unused var `topic'.
(352): Remove unused var `hopcount'.
2016-04-02 15:38:54 -04:00
Eli Zaretskii
0020047fda Adapt calls to 'format-time-string' to changes in Emacs 25
* lisp/vc/pcvs-info.el (cvs-fileinfo-from-entries): Use t as the
last argument to format-time-string.  (Bug#23128)
* lisp/gnus/gmm-utils.el (gmm-format-time-string): Use t as the
last argument to format-time-string, when the TZ argument is not a
number, per the doc string.
2016-04-02 14:25:47 +03:00
Eli Zaretskii
17b5152d73 Improve vc-diff with Git backend
* lisp/vc/vc-git.el (vc-git-command): Don't override
coding-system-for-read/write if they are already bound.
Suggested by joaotavora@gmail.com (João Távora).  (Bug#20892)
(vc-git-print-log): Don't override coding-system-for-read if it's
already bound.
2016-04-02 12:25:15 +03:00
Dmitry Gutov
c28f87a53d (js--continued-expression-p): Special-case unary plus and minus
* lisp/progmodes/js.el (js--continued-expression-p): Make an
effort to recognize unary plus and minus, in the contexts where
they make sense (https://github.com/mooz/js2-mode/issues/322).
2016-04-02 03:07:09 +03:00
Eli Zaretskii
2d02a5f729 ; * lisp/vc/vc-annotate.el (vc-annotate): Clarify commentary. 2016-04-01 23:22:52 +03:00
Alan Mackenzie
9151f16e81 Prevent C++ Mode wrongly fontifying some identifiers near templates as types
This fixes debbugs #7917.

* lisp/progmodes/cc-engine.el (c-forward-keyword-prefixed-id): Accept 'maybe
(from c-forward-type) as sufficient to record an id.  Record type id as well
as ref ids.
(c-forward-name): Bind c-last-identifier-range around the call to
c-forward-<>-arglist to prevent it getting corrupted.  Don't automatically
assume an identifier is a type when a template ">" is followed by a "(".
(c-forward-type): Don't automatically assume an identifier is a type when a
template ">" is followed by a "(".

* lisp/progmodes/cc-fonts.el (c-font-lock-<>-arglists): Don't fontify an
identifier as a type when its associated ">" is followed by a "(".
2016-04-01 12:56:16 +00:00
Glenn Morris
41da5acd49 ; Auto-commit of loaddefs files. 2016-04-01 06:18:11 -04:00
Mark Oteiza
a3daa34336 Teach M-x disassemble a default argument.
Adopts default argument in the same way as `describe-function'.
* lisp/emacs-lisp/disass.el (disassemble): Default to function at point,
if any.
2016-03-31 19:34:05 -04:00
Eli Zaretskii
e30c3e9a9c Fix EOL decoding in vc-annotate with SVN back-end on MS-Windows
* lisp/vc/vc-annotate.el (vc-annotate): Force DOS EOL decoding on
MS-Windows and MS-DOS, when processing the output of "svn annotate".
2016-03-31 23:01:13 +03:00
Simen Heggestøyl
750e1e1942 Support completion of bang-rules in CSS mode
lisp/textmodes/css-mode.el (css--bang-ids): New buffer-local variable
holding the list of bang-rules for the current mode.
(css--font-lock-keywords): Retrieve bang-rules from `css--bang-ids'
instead of computing them.
(css--complete-bang-rule): New function for completing a bang-rule.
(css-completion-at-point): Add support for completing bang-rules.
(scss-font-lock-keywords): Change from a variable to a function in
order to recompute `css--font-lock-keywords' when `css--bang-ids' has
changed.
(scss-mode): Set `css--bang-ids' and recompute font-lock keywords.
2016-03-31 21:21:34 +02:00
Michael Albinus
df441b362c Fix OS X specific settings in tramp-tests
* lisp/net/tramp-sh.el (tramp-maybe-open-connection): Use it.

* lisp/net/tramp.el (tramp-get-local-locale): New defun.

* test/automated/tramp-tests.el (tramp--test-darwin-p): Remove.
(tramp--test-utf8): Improve settings of coding systems.
Do not use `tramp--test-darwin-p' anymore.  (Bug#22145)
2016-03-31 11:45:45 +02:00
Alan Mackenzie
2244331218 Finish fixing a cacheing bug in CC Mode (see 2016-03-09)
* lisp/progmodes/cc-cmds.el: (c-beginning-of-defun, c-end-of-defun): Remove
superfluous invocations of c-self-bind-state-cache.

* lisp/progmodes/cc-defs.el: (c-self-bind-state-cache): Copy and terminate
markers correctly.

* lisp/progmodes/cc-engine.el (c-record-parse-state-state): Terminate stale
markers.
2016-03-30 17:14:03 +00:00
Simen Heggestøyl
09462b9548 Add HTML4 tags to HTML mode
* lisp/textmodes/sgml-mode.el (html-tag-alist): Add HTML4 tags.
(html-tag-help): Add short descriptions of those tags.
2016-03-30 18:40:37 +02:00
Oleh Krehel
9e68dfa23e Add support for 7z archives
* lisp/dired-aux.el (dired-compress-file-suffixes): "Z" should now
  also work with 7z archives.

The shell command should produce a single extracted directory named
after the archive's name.

In case the extracted directory exists, all files will be overwritten
without a prompt. This matches the expected behavior with the "tar.gz"
archives.
2016-03-29 16:05:55 +02:00
Nicolas Petton
6df158cf55 * lisp/emacs-lisp/seq.el: Require cl-lib instead of cl-extra 2016-03-29 12:43:13 +02:00
Alan Mackenzie
f99b51295b In M-%, avoid making buffer-local binding of text-property-default-nonsticky
This would happen when that variable already has a buffer local binding.  Such
a binding would not be seen by read-from-minibuffer.  This fixes bug #23127.

* lisp/replace.el (query-replace-read-from): Move the binding of
text-property-default-nonsticky to inside of a new with-current-buffer buffer
form with the minibuffer as argument.
2016-03-29 09:53:12 +00:00
Nicolas Petton
2946344a23 New function seq-sort-by in seq.el
* lisp/emacs-lisp/seq.el (seq-sort-by): New function.
* test/lisp/emacs-lisp/seq-tests.el: New test for seq-sort-by.
* doc/lispref/sequences.texi: Add documentation for seq-sort-by.
2016-03-29 09:19:32 +02:00
Lars Magne Ingebrigtsen
742bf8243c Have `M-q' not mark buffers are changed when they haven't
* lisp/textmodes/fill.el (fill-paragraph): Use `buffer-hash'
to avoid marking buffers as changed when they haven't.
2016-03-28 19:08:50 +02:00
Dmitry Gutov
124c48619e Remove prog-indentation-context
* lisp/progmodes/prog-mode.el: (prog-indentation-context)
(prog-first-column, prog-widen): Remove, as discussed in
http://lists.gnu.org/archive/html/emacs-devel/2016-03/msg01425.html.

* doc/lispref/text.texi (Mode-Specific Indent): Remove references
to them.

* etc/NEWS: Ditto.

* lisp/progmodes/python.el: (prog-widen, prog-first-column):
Remove the compatibility aliases and all uses.

Do not merge to master.
2016-03-28 03:59:05 +03:00
Eli Zaretskii
c8b868b1e2 Don't start the 'midnight' timer twice
* lisp/midnight.el (midnight-mode): Avoid starting the midnight
timer twice when activating the mode the first time.  (Bug#23123)
2016-03-27 18:15:06 +03:00
John Wiegley
efb1883244 Restore the fix to bug#18527 from commit d6868025 2016-03-26 17:22:03 -07:00
Stephen Berman
e5c17f4678 Fix todo-mode category movement
* lisp/calendar/todo-mode.el (todo-move-category): Use moved
category's existing categories sexp instead of invoking
todo-update-categories-sexp in file moved to, in order to take
archived items into account.  If the moved category has archived
items, handle the source archive buffer properly.  Remove
superfluous code.
2016-03-26 23:14:50 +01:00
Glenn Morris
bc70fda2c9 * lisp/xt-mouse.el (xterm-mouse-utf-8): Add :version. 2016-03-26 16:45:51 -04:00
Alan Mackenzie
368b9bb45f Fix absence of c-noise-macro-name-re, etc., in languages which don't use it
* lisp/progmodes/cc-engine.el (c-forward-keyword-prefixed-id, c-forward-type)
(c-forward-declarator, c-forward-decl-or-cast-1, c-backward-over-enum-header)
(c-guess-basic-syntax): Check c-opt-cpp-prefix before `looking-at'
c-noise-macro-with-parens-name-re.

* lisp/progmodes/cc-fonts.el (c-complex-decl-matchers): The same as for
cc-engine.el.

* lisp/progmodes/cc-mode.el (c-basic-common-init): Add call to
`c-make-noise-macro-regexps'.
(c-mode, c++-mode, objc-mode): Remove calls to `c-make-noise-macro-regexps'.

* lisp/progmodes/cc-vars.el (c-noise-macro-with-parens-name-re)
(c-noise-macro-with-re): Initialize to "\\<\\>" rather than nil.
2016-03-25 18:25:08 +00:00
Lars Magne Ingebrigtsen
7570b35740 (shr-insert): Respect non-breaking space in non-<pre> text
* lisp/net/shr.el (shr-insert): Respect non-breaking space in
non-<pre> text.
2016-03-25 16:57:35 +01:00
Lars Magne Ingebrigtsen
b2e629c0d0 parse-times-string doc string clarification
* lisp/calendar/parse-time.el (parse-time-string): Note that
we accept RFC2822 strings.
2016-03-25 16:32:39 +01:00
Marcin Borkowski
2812099bcc Doc string fix
* lisp/calendar/parse-time.el (parse-time-tokenize): Clarify
doc string and clean up code.
2016-03-25 16:26:31 +01:00
Eli Zaretskii
1e1ea22e91 Fix 'dired-goto-file' in Dired buffers produced by find-dired
* lisp/dired.el (dired-goto-file): Try looking for the file as a
relative name with leading sub-directories, before looking for the
basename alone.  (Bug#23089)
2016-03-25 17:18:21 +03:00
Nicolas Petton
3a13472ade Fix map-put and map-delete for alists (Bug#23105)
* lisp/emacs-lisp/map.el (map-put): Do not bind the evaluated place
expression to a new symbol.
* test/lisp/emacs-lisp/map-tests.el: Add a regression test.
2016-03-25 15:11:23 +01:00
Michael Albinus
c62371c23b Cleanup file notification code in Tramp
* lisp/net/tramp-sh.el (tramp-sh-handle-file-notify-add-watch):
Make `events' a list of symbols for "inotifywait".
(tramp-sh-gvfs-monitor-dir-process-filter): Make event a list.
Call `file-notify-handle-event' for better traces.
(tramp-sh-inotifywait-process-filter): Check for expected events.
Call `file-notify-handle-event' for better traces.
2016-03-25 14:36:14 +01:00
Philipp Stephani
90fb9b38dd Add customization option for using UTF-8 coordinates in xt-mouse
* lisp/xt-mouse.el (xterm-mouse-utf-8): New customization option.
(xterm-mouse--read-coordinate): New function to replace
`xterm-mouse--read-utf8-char'; uses UTF-8 only if enabled.
(xterm-mouse--read-number-from-terminal): Adapt to new name.
(xterm-mouse-tracking-enable-sequence)
(xterm-mouse-tracking-disable-sequence): Replace constants with
functions, mark constants as obsolete.
(xterm-mouse--tracking-sequence): New helper function.
(turn-on-xterm-mouse-tracking-on-terminal): Use new functions;
enable UTF-8 only if customization option says so; store UTF-8
flag in terminal parameter.  (Bug#23009)

* test/automated/xt-mouse-tests.el: Add tests for xt-mouse.el.
2016-03-25 13:17:38 +03:00
Eli Zaretskii
f14d463661 Minor doc string fixes in replace.el
* lisp/replace.el (query-replace, query-replace-regexp)
(query-replace-regexp-eval, map-query-replace-regexp)
(replace-string, replace-regexp): Clarify in doc strings that
these commands operate from point to the end of the buffer's
accessible portion.  (Bug#23067)
2016-03-25 13:02:20 +03:00
Eli Zaretskii
326c64fcc3 Fix splash screen display at startup
* src/frame.c (DEFAULT_ROWS): Enlarge to 36, so that the initial
window displayed by "emacs -q" has enough space to show the whole
text even if it includes 2 lines talking about recovering crashes
sessions.  (Bug#23074)

* lisp/startup.el (use-fancy-splash-screens-p): Fix off-by-one
error when computing the window-height from frame-height.

* etc/NEWS: Mention the change.
2016-03-25 10:45:39 +03:00
Paul Eggert
5ec105648b Avoid stray As next to IDLW icons
* lisp/progmodes/idlw-toolbar.el (idlwave-toolbar-add-everywhere):
Use "" for empty labels, not "a", as the latter now displays stray
"A"s (Bug#18997).
2016-03-24 16:53:24 -07:00
Juri Linkov
e99ff6e85a * lisp/minibuffer.el (minibuffer-completion-help): Use fit-window-to-buffer
instead of shrink-window-if-larger-than-buffer.  (Bug#23092)
2016-03-25 00:14:24 +02:00
Paul Eggert
73d213f281 Comint, term, and compile now set EMACS
This fixes directory tracking in ansi-term, at the expense of
breaking some usages of 'configure'.  Setting EMACS is meant to be
a somewhat temporary measure, until Bash 4.4 comes out and is
common.  (Bug#20484).
* etc/NEWS: Document this.
* lisp/comint.el (comint-exec-1):
* lisp/net/tramp-sh.el (tramp-remote-process-environment):
* lisp/progmodes/compile.el (compilation-start):
* lisp/term.el (term-exec-1):
Go back to setting the EMACS environment variable, for backward
compatibility to Bash 4.3 and earlier.
2016-03-23 15:08:19 -07:00
Paul Eggert
39577d0712 Merge from origin/emacs-25
ad250f2 Sync with gnulib
c0165ea Resurrect GNUS-NEWS autogeneration

# Conflicts:
#	etc/GNUS-NEWS
#	lisp/Makefile.in
2016-03-23 11:27:22 -07:00