1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-11 14:01:43 -08:00
Commit graph

118240 commits

Author SHA1 Message Date
Alan Mackenzie
ec02f4fe1d Fix error with `mark-defun' and "protected:" in C++ Mode.
Fixes: debbugs:19134.

progmodes/cc-cmds.el (c-where-wrt-brace-construct): Handle a return code
of (label) from c-beginning-of-decl-1.
2014-11-22 21:41:00 +00:00
Glenn Morris
cc252fc141 Add some .ico dependencies to Makefile .res rules
* lib-src/Makefile.in (emacsclient.res): Add dependency on icons/emacs.ico.

* nt/Makefile.in (emacs.res): Add dependency on icons/hand.cur.
2014-11-22 13:32:34 -08:00
Glenn Morris
9a84825892 * nextstep/templates/Info-gnustep.plist.in: Let configure set URL. 2014-11-22 13:10:26 -08:00
“Martin
db67afbd8c Don't shrink frame when using desktop-save-mode (Bug#19048).
* w32fns.c (x_set_tool_bar_lines): Always call
x_change_tool_bar_height (Bug#19048).
(x_change_tool_bar_height): Mark frame as garbaged since
adjust_frame_size might not have done that.
* xfns.c (x_set_tool_bar_lines): Always call
x_change_tool_bar_height (Bug#19048).
(x_change_tool_bar_height): Mark frame as garbaged since
adjust_frame_size might not have done that.
2014-11-22 17:59:59 +01:00
Ulf Jasper
46035c64e6 newsticker: Fix bug#18787: Tell libxml-parse-xml-region to discard comments.
* lisp/net/newst-backend.el (newsticker--sentinel-work): Tell
`libxml-parse-xml-region' to discard comments. Fixes bug#18787.
2014-11-22 15:51:12 +01:00
Michael Albinus
b559a60382 Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs 2014-11-22 12:38:21 +01:00
Michael Albinus
cd22fd754b Propagate remote process environment.
* net/tramp-sh.el (tramp-sh-handle-start-file-process)
(tramp-sh-handle-process-file): Propagate `process-environment'.

* vc/vc-hg.el (vc-hg-state): No special handling for remote files;
Tramp propagates environment variables now.
2014-11-22 12:37:04 +01:00
Eric S. Raymond
cec2396625 Unbreak the build.
I don't really understand why this reversion works, but it will do until I can
actually comprehend the bizarre hairball that is Emacs bootstrapping.
2014-11-22 06:32:48 -05:00
Eric S. Raymond
e9b1902634 Revert "More movement of master-related code to vc-filewise.el."
Must unbreak the build.  Which is way too complicated...
2014-11-22 06:03:57 -05:00
Eric S. Raymond
4fe5b7c0bb More movement of master-related code to vc-filewise.el.
Goes with my 2014-11-22 lisp/ChangeLog entry.
2014-11-22 05:21:09 -05:00
Eric S. Raymond
354a07b570 Isolating support code for the file-granularity back ends: the easy part.
* vc-filewise.el: New file to isolate code used only by the
file-oriented back ends (SCCS/RCS/CVS/SRC) which should not live in
vc.el and certainly not in vc-hooks.el.
2014-11-22 00:31:20 -05:00
Eric S. Raymond
af46a2a43f Rename vc-name to vc-master-rename.
* vc-hooks.el, vc-rcs.el, vc-sccs.el: vc-name -> vc-master-name.  This
is preaparatory to isolating all the 'master' functions used only by
the file-oriented back ends.  With this done first, the substantive
diffs will be easier to read.
2014-11-22 00:10:31 -05:00
Rüdiger Sonderfeld
280eb43f65 lisp/ChangeLog: Use double space to end sentence. 2014-11-21 20:16:34 +01:00
Rüdiger Sonderfeld
65ed0f3ba9 Fix `nato-alphabet' docstring.
* play/morse.el (nato-alphabet): Mark URL in docstring in a way that
is recognized by `help-mode'.
2014-11-21 20:10:08 +01:00
Stefan Monnier
bf642130c1 * lisp/desktop.el (desktop-create-buffer): Use activate-mark to set
`mark-active' (bug#19058).
2014-11-21 13:01:40 -05:00
Ulf Jasper
c39443c1d6 'libxml-parse(html|xml)-region': new optional param 'discard-comments'.
* doc/lispref/text.texi (Parsing HTML/XML): Document new optional parameter
'discard-comments' of 'libxml-parse(html|xml)-region'.

* src/xml.c (parse_region): Take care of new optional parameter
'discard-comments' of 'libxml-parse(html|xml)-region'.
(Flibxml_parse_html_region, Flibxml_parse_xml_region): New
optional parameter 'discard-comments'.

* test/automated/libxml-tests.el
(libxml-tests--data-comments-preserved): Renamed from
'libxml-tests--data'.
(libxml-tests--data-comments-discarded): New.
(libxml-tests): Check whether 'libxml-parse-xml-region' is
discarding comments correctly.
2014-11-21 16:31:30 +01:00
Eric S. Raymond
e14c4354cf Fix bug that produced spurious nil state. 2014-11-21 07:29:51 -05:00
Eli Zaretskii
a131037e97 Fix bug #19084 with 'C-x v +' in *vc-change-log* buffers.
lisp/vc/vc.el (vc-deduce-fileset): Support invocation from
 *vc-change-log* buffer.
2014-11-21 12:14:32 +02:00
Matthew Leach
48039f4b4c Fix bug #1702 with missing feature in arc-mode.el.
lisp/arc-mode.el (archive-visit-single-files): New.
 (archive-mode): Visit file if archive contains a single file.
2014-11-21 12:08:00 +02:00
Eli Zaretskii
1b351d4673 Fix the build of the Emacs User manual.
doc/emacs/maintaining.texi (Version Control Systems): Move "@end itemize"
 past the last @item.  Fix a typo (reported by H. Dieter Wilhelm
 <dieter@duenenhof-wilhelm.de>).
2014-11-21 11:32:53 +02:00
Ulrich Mueller
a2c0a14c32 Fix bug #19136 with a typo in a vc.el comment.
lisp/vc/vc.el: Fix a typo in the commentary.
2014-11-21 11:21:50 +02:00
Eric S. Raymond
f9c0081e98 Clean up after SRC support merge (typo fixes). 2014-11-20 22:44:07 -05:00
Eric S. Raymond
1e81f67690 Support for SRC in VC mode. 2014-11-20 17:57:22 -05:00
Eric S. Raymond
e7e9dbccb0 Remove editable argument from VC's backend checkout methods.
Alters vc/vc-bzr.el, vc/vc-cvs.el, vc/vc-dav.el, vc/vc-git.el,
vc/vc-hg.el, vc/vc-mtn.el, vc/vc-rcs.el, vc/vc-sccs.el,
vc/vc-svn.el, vc/vc.el.

where this matters (which is only in SCCS and RCS) files are now always
checked out editable. This may actually have been dynamically true
already - it looks like the vc-next-action code evolved past visiting
the other case. Tested with RCS.
2014-11-20 03:52:24 -05:00
Eric S. Raymond
f83109f0fa Remove never-used rev argument from VC's backend checkin methods.
Alters vc/vc-arch.el, vc/vc-bzr.el, vc/vc-cvs.el, vc/vc-dav.el,
vc/vc-git.el, vc/vc-hg.el, vc/vc-mtn.el, vc/vc-rcs.el,
vc/vc-sccs.el, vc/vc-svn.el, vc/vc.el.

Only the RCS, SCCS, and CVS back ends tried to do anything with it,
and that code was never exercised. Chiseling away the cruft of
decades...
2014-11-20 02:37:06 -05:00
Dani Moncayo
f5d77aafa9 build-aux/msys-to-w32: Simplify implementation and docstring.
* build-aux/msys-to-w32: Simplify implementation and docstring;
Paths starting with '%emacs_dir%' are just considered relative.
2014-11-19 21:15:32 +01:00
Lars Magne Ingebrigtsen
f437176169 Add missing bug numbers to last few eww changes 2014-11-19 20:14:19 +01:00
Ivan Shmakov
c2678a68dc * eww.texi (Basics): Document `eww-history-limit'. 2014-11-19 20:11:18 +01:00
Leo Liu
9c2c15edb5 Add NEWS entry for define-advice
* NEWS: Mention new macro define-advice.
2014-11-20 02:18:01 +08:00
Lars Magne Ingebrigtsen
e25e7693cd * net/eww.el (eww-render): Remove a no-op :title setting. 2014-11-19 18:41:17 +01:00
Ivan Shmakov
9fd6f5963b (eww-reload): Reload the page in the right buffer. 2014-11-19 18:37:18 +01:00
Ivan Shmakov
8d5bfc4900 (eww-history-limit): New variable.
* net/eww.el (eww-history-limit): New variable.
(eww-save-history): Use it.
2014-11-19 18:28:19 +01:00
Lars Magne Ingebrigtsen
a8995cae4c * net/eww.el (eww-desktop-misc-data): Use `cl-remove-duplicates'. 2014-11-19 18:22:45 +01:00
Ivan Shmakov
7d77dc18c7 Add desktop support to eww
* net/eww.el (eww-desktop-remove-duplicates)
(eww-restore-desktop, eww-restore-reload-prompt): New variables.
(eww-mode): Set up desktop mode.
(eww-desktop-data-save, eww-desktop-data-1)
(eww-desktop-history-duplicate, eww-desktop-misc-data)
(eww-restore-desktop): New functions.
2014-11-19 18:21:58 +01:00
Eli Zaretskii
e9917c08dc Fix bug #19101 with log-view-mode set in the wrong buffer.
lisp/vc/vc.el (vc-log-internal-common): Turn on log-view-mode in the
 correct buffer.  (Bug#19101)
2014-11-19 18:11:05 +02:00
Rüdiger Sonderfeld
6ffab21f41 vc-git: Support `diff-switches'.
Fix bug#19099.
* lisp/vc/vc-git.el (vc-git-diff): Use "difftool -x diff" with
  `diff-switches' if `vc-git-diff-switches' is nil.
2014-11-19 12:09:57 +01:00
Artur Malabarba
6316435de7 lisp/ido.el: New command `ido-bury-buffer-at-head'
Bound to C-S-b
Bury the buffer at the head of `ido-matches', analogous to how C-k
kills the buffer at head.
2014-11-19 00:47:36 +00:00
Juri Linkov
4a306d701b * lisp/simple.el (next-line-or-history-element): Wrap next-line in with-no-warnings.
(previous-line-or-history-element): Wrap previous-line in with-no-warnings.
2014-11-19 00:23:47 +02:00
Juri Linkov
239aa11e1e * lisp/progmodes/grep.el (grep-compute-defaults): Compute grep-highlight-matches before its use. 2014-11-19 00:05:09 +02:00
Juri Linkov
c0b877ba35 * lisp/replace.el (query-replace-from-to-separator): Turn defvar into defcustom.
Wrap char-displayable-p in ignore-errors because an attempt
to autoload char-displayable-p fails during pre-loading.
Move (propertize "\0" ... 'separator t) out of customizable part
to query-replace-read-from.
(query-replace-read-from): Call custom-reevaluate-setting on
query-replace-from-to-separator to reevaluate the separator
depending on the return value of char-displayable-p.
http://lists.gnu.org/archive/html/emacs-devel/2014-11/msg00466.html
2014-11-18 23:59:14 +02:00
Juri Linkov
5c0fbcfc8a Use <up> and <down> keys to move point in the multi-line minibuffer.
* lisp/bindings.el (minibuffer-local-map): Rebind [down] from
next-history-element to next-line-or-history-element, and [up]
from previous-history-element to previous-line-or-history-element.

* lisp/simple.el (next-line-or-history-element)
(previous-line-or-history-element): New commands.

http://lists.gnu.org/archive/html/emacs-devel/2014-11/msg00822.html
2014-11-18 23:33:42 +02:00
Rüdiger Sonderfeld
cb4f666ade lisp/ChangeLog: Fix bug#11386. 2014-11-18 18:01:55 +01:00
Rüdiger Sonderfeld
b2c4e6c825 lisp/ChangeLog: add bug#13871.
There was a similar patch in bug#13871.
2014-11-18 17:55:21 +01:00
Leo Liu
1148d37589 New macro define-advice
* doc/lispref/functions.texi (Advising Named Functions): Document
define-advice.

* lisp/emacs-lisp/nadvice.el (define-advice): New macro.
* lisp/emacs-lisp/lisp-mode.el (lisp-imenu-generic-expression): Add
define-advice.
(lisp-font-lock-keywords-1): Add define-advice.
2014-11-18 23:57:01 +08:00
Glenn Morris
b59998eb5b Use automatic variables in nt/Makefile.in
* nt/Makefile.in (addpm${EXEEXT}, ddeclient${EXEEXT})
(cmdproxy${EXEEXT}, runemacs${EXEEXT}, emacs.res):
Use automatic variables.
2014-11-17 23:59:44 -08:00
Daiki Ueno
9e8da9d279 epg: Support key editing
* epg.el (epg-context): New slot EDIT-CALLBACK.
(epg--process-filter): Call EDIT-CALLBACK when editing a key.
(epg-reset): Reset EDIT-CALLBACK of the context.
(epg-start-edit-key): New function.
(epg-edit-key): New function.
2014-11-18 16:19:14 +09:00
Paul Eggert
b3cb91e07c Port new time stamp handling to Emacs 23.2.
This fix is for Gnus.  Problem reported by Katsumi Yamaoka.
* calendar/time-date.el (time-add, time-subtract, time-less-p):
Use eval-and-compile, not eval-when-compile.
2014-11-17 22:44:51 -08:00
Daiki Ueno
5c249e2a04 epg: Fix callback argument type check
* epg.el (epg-context-set-passphrase-callback)
(epg-context-set-progress-callback): Check if the CALLBACK
argument is a function, instead of a cons.
2014-11-18 14:54:01 +09:00
Daiki Ueno
5224be2f74 epg: Simplify epa-pinentry-mode handling
* epa-file.el (epa-file-insert-file-contents)
(epa-file-write-region): Remove redundant check of
epa-pinentry-mode.
* epa.el (epa-sign-file, epa-encrypt-file, epa-decrypt-region)
(epa-sign-region, epa-encrypt-region): Remove redundant check of
epa-pinentry-mode.
2014-11-18 14:53:54 +09:00
Daiki Ueno
b12bb4dc3e epg: Don't show "*Error*" buffer when visiting a new file
* epa-file.el (epa-file-insert-file-contents): Don't show
"*Error*" buffer if input file does not exist.
Reported by Herbert J. Skuhra.
2014-11-18 12:48:14 +09:00