1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-27 15:52:00 -08:00
Commit graph

61588 commits

Author SHA1 Message Date
Glenn Morris
fd60bf6c90 Merge from emacs-24; up to 2014-06-02T11:35:40Z!michael.albinus@gmx.de 2014-06-08 16:41:43 -07:00
Glenn Morris
6d069b1b3a Small doc updates re initial-buffer-choice
* doc/emacs/entering.texi (Entering Emacs): Small fix re initial-buffer-choice.

* doc/emacs/misc.texi (emacsclient Options): Copyedit.

* doc/lispref/os.texi (Startup Summary): Small fix for initial-buffer-choice.

* lisp/startup.el (initial-buffer-choice): Doc fix.
Reset :version (adding an option does not merit a :version bump).
2014-06-08 10:46:51 -07:00
Glenn Morris
99d8aedf0d Doc edits re uniquify
* doc/emacs/buffers.texi (Uniquify): Copyedits.

* doc/emacs/files.texi (Visiting): Update for uniquify changes.

* doc/lispref/files.texi (Subroutines of Visiting): Mention uniquify.

* doc/misc/vip.texi (Files): Defer to Emacs manual for uniquify details.

* lisp/bookmark.el (bookmark-load): Doc fix.

* lisp/uniquify.el (uniquify-buffer-name-style): Doc fix.

* lisp/files.el: Comment.

* etc/NEWS: Related edit.
2014-06-08 00:41:27 -07:00
Glenn Morris
36cf8493af Merge from emacs-24; up to 2014-06-01T23:37:59Z!eggert@cs.ucla.edu 2014-06-07 17:35:27 -07:00
Juri Linkov
7f11800984 * lisp/desktop.el: Activate auto-saving on window configuration changes.
(desktop-save-mode, desktop-auto-save-timeout): Add/remove
`desktop-auto-save-set-timer' to/from `window-configuration-change-hook'.
(desktop-auto-save-set-timer): Change REPEAT arg of
`run-with-idle-timer' from t to nil.
http://lists.gnu.org/archive/html/emacs-devel/2014-06/msg00147.html
2014-06-07 02:38:40 +03:00
Santiago Payà i Miralta
3112e4002c * lisp/vc/vc-hg.el (vc-hg-create-tag, vc-hg-retrieve-tag): New functions.
Fixes: debbugs:17586
2014-06-06 12:38:44 -04:00
Santiago Payà i Miralta
f4be80b783 * lisp/vc/vc-hg.el (vc-hg-working-revision): Use "hg parent" and
vc-hg-command.

Fixes: debbugs:17570
2014-06-06 12:29:55 -04:00
Santiago Payà i Miralta
90b15d9159 * lisp/vc/vc-hg.el (vc-hg-log-graph): New var.
(vc-hg-print-log): Use it.
(vc-hg-root-log-format): Include branch name and bookmarks; ignore
graph output.

Fixes: debbugs:17515
2014-06-06 12:11:53 -04:00
Stefan Monnier
3da983f8c4 * src/window.c (Frecenter): Signal an error if window-buffer is not
current-buffer.
2014-06-06 10:37:05 -04:00
Stefan Monnier
28b8329726 * lisp/international/mule-cmds.el (ucs-names): Add special entry for BEL.
Fixes: debbugs:17702
2014-06-06 10:25:39 -04:00
Glenn Morris
b83798031c Doc updates re window-setup-hook
* lisp/startup.el (window-setup-hook): Doc fix.

* doc/lispref/display.texi (Window Systems): Remove window-setup-hook.

* doc/lispref/os.texi (Startup Summary, Init File):
Improve description of window-setup-hook.
(Terminal-Specific): Update window-setup-hook cross-reference.

* doc/lispref/hooks.texi (Standard Hooks):
Update window-setup-hook cross-reference.
2014-06-06 00:19:23 -07:00
Stefan Monnier
631de55bc1 * lisp/mouse.el (mouse-posn-property): Ignore buffer position info when the
even happened elsewhere.
* src/keyboard.c (make_lispy_position): Don't include a buffer position in
mode/header-line mouse events.
2014-06-05 22:35:17 -04:00
Mario Lang
4a81602043 * emacs-lisp/tabulated-list.el (tabulated-list-print): Only call
`recenter' if `current-buffer' is equal to `window-buffer'.
2014-06-06 02:39:22 +02:00
Leo Liu
d4e355b45d * emacs-lisp/cl-macs.el (cl-macrolet): Simplify last change. 2014-06-06 07:08:59 +08:00
Katsumi Yamaoka
dd97cafcf2 lisp/gnus/gnus-art.el (gnus-mime-buttonize-attachments-in-header): Improve criterion that finds parts to display 2014-06-05 22:43:36 +00:00
Leo Liu
14781f7f44 * emacs-lisp/cl-macs.el (cl-macrolet): Avoid excessive progn's. 2014-06-06 01:08:18 +08:00
Michal Nazarewicz
03d7d160c3 tildify.el: Rewrite `tildify-region' and co., add foreach function.
* lisp/textmodes/tildify.el (tildify-foreach-region-outside-env): New
function which calls a callback on portions of the buffer that are
outside of ignored environments.
(tildify-build-regexp): Remove function since it is now
incorporated in `tildify-foreach-region-outside-env' where it is
optimised and simplified by the use of `mapconcat'.
(tildify-tildify): Return number of substitutions made so that…
(tildify-count): …can be removed.
(tildify-find-env): Accept a new PAIRS argument which was
previously looked up in `tildify-ignored-environments-alist' each
time the function was called.  With this change, the lookup is
performed only once in `tildify-foreach-region-outside-env'.
(tildify-region): Greatly simplify the function since now most of
the work is done by `tildify-foreach-region-outside-env'.
(tildify-mode-alist): Simplify slightly by avoiding if and setq
and instead using or.

* tests/automated/tildify-tests.el (tildify-test-find-env-end-re-bug)
(tildify-test-find-env-group-index-bug): Update to support new
signature of the `tildify-foreach-region-outside-env' function.
Namely, it now takes pairs as an argument instead of looking it up in
`tildify-ignored-environments-alist'.
2014-06-05 16:42:07 +02:00
Michal Nazarewicz
df344ab435 tildify.el: Optimise environments regexes
* lisp/textmodes/tildify.el (tildify-ignored-environments-alist):
Each time beginning of an environment to ignore is found,
`tildify-find-env' needs to identify regexp for the ending
of the environment.  This is done by trying all the opening
regexes on matched text in a loop, so to speed that up, this
loop should have fewer things to match, which can be done by
using alternatives in the opening regexes.

Coincidentally, this should make matching of the opening
regexp faster as well thanks to the use of `regexp-opt' and
having common prefix pulled from many regexes.
2014-06-05 16:41:32 +02:00
Michal Nazarewicz
eb54c73a9d tildify.el: Better support for XML
* lisp/textmodes/tildify.el  (tildify-string-alist)
(tildify-ignored-environments-alist): Add `nxml-mode' to the list of
supported modes since `xml-mode' is no longer a thing but just an
alias to the former.  Also include comments and insides of tags in
`tildify-ignored-environments-alist' for XML modes.  Finally, since
XML does not define “ ”[1], use a numeric reference for
a no-break space (namely “ ”)

[1] XML specification defines only a handful of predefined entities.
    The list is at <http://www.w3.org/TR/REC-xml/#sec-predefined-ent>
    and includes only &lt;, &gt;, &amp;, &apos; and &quot; (meaning <,
    >, &, ' and " respectively).  This is in contrast to HTML and even
    XHTML which defined a whole bunch of entities including “&nbsp;”.

* automated/tildify-tests.el (tildify-test--example-html): Add support
for generating XML code, so that…
(tildify-test-xml) …test can be added to check handling of XML
documents.
2014-06-05 16:41:01 +02:00
Michal Nazarewicz
e01e361f93 tildify.el: Improve defcustom's types
* lisp/textmodes/tildify.el (tildify-pattern-alist)
(tildify-string-alist, tildify-ignored-environments-alist):
Add more tags explaining what each value means and replace
“sexp” used in `tildify-ignored-environments-alist' with
a full type declaration.
2014-06-05 16:40:26 +02:00
Michal Nazarewicz
9342feecdd tildify.el: Fix matched group indexes in end-regex building
* lisp/textmodes/tildifi.el (tildify-find-env): When looking for
a start of an ignore-environment, the regex is built by
concatenating regexes of all the environments configured in
`tildify-ignored-environments-alist'.  So for example, the following
list could be used to match TeX's \verb and \verb* commands:

    (("\\\\verb\\(.\\)" . (1))
     ("\\\\verb\\*\\(.\\)" . (1)))

This would result in the following regex being used to find the start
of any of the variants of the \verb command:

    \\\\verb\\(.\\)\\|\\\\verb\\*\\(.\\)

But now, if “\\\\verb\\*\\(.\\)” matches, the first capture group
won't match anything, and thus (match-string 1) will be nil, which
will cause building of the end-matching regex to fail.

Fix this by using capture groups from the time when the opening
regexes are matched individually.

* tests/automated/tildify-tests.el (tildify-test-find-env-group-index-bug):
New test validating fix to the above bug.
2014-06-05 16:39:18 +02:00
Michal Nazarewicz
af9a3b28c0 tildify.el: Fix end-regex building in `tildify-find-env'
* lisp/textmodes/tildify.el (tildify-find-env): The
`tildify-ignored-environments-alist' allows the end-regex
to be provided not as a static string but mix of strings and
indexes of groups matched the begin-regex.  For example, the
“\verb!…!” TeX-command (where “!” is an arbitrary character)
is handled using:

    ("\\\\verb\\*?\\(.\\)" . (1))

In the same way, the following should be supported as well:

    ("open-\\(.\\)" . ("end-" 1))

However the tildify-find-env function fails at

    (concat result
            (if (stringp (setq aux (car expression)))
                 expression  ; BUG: expression is a list
               (regexp-quote (match-string aux))))

where the string part is handled incorrectly.

The most trivial fix would be to replace `expression'
in the true-part of the if-statement with `aux', but
instead, this commit optimises `tildify-find-env' by
changing it to use `mapconcat' rather than open-coded
while-loop.

* tests/automated/tildify-tests.el (tildify-test-find-env-end-re-bug):
New test validating fix to the above bug.
2014-06-05 16:37:45 +02:00
Mario Lang
a1d799c25e * woman.el (woman-mapcan): Remove.
(woman-parse-colon-path): Use cl-mapcan instead.
2014-06-05 15:40:54 +02:00
Glenn Morris
879f52734c * lisp/emacs-lisp/package.el: Comment update 2014-06-05 00:08:42 -07:00
Glenn Morris
e1b3f35f93 Some documentation for signing of packages
* doc/emacs/package.texi (Package Menu, Package Installation):
Mention signed packages.

* doc/lispref/package.texi (Package Archives): Mention signing packages.

* lisp/emacs-lisp/package.el (package-check-signature)
(package-unsigned-archives): Doc fixes.

* etc/NEWS: Related edits.
2014-06-04 23:15:44 -07:00
Katsumi Yamaoka
0d46b5f12c Gnus: fix last change
* gnus-art.el (gnus-article-edit-part): Don't modifiy markers.
(gnus-article-read-summary-keys):
Don't bug out when there is no article in the summary buffer.

* gnus-art.el (gnus-mm-display-part):
* mm-decode.el (mm-shr):
* mm-view.el (mm-inline-text-html-render-with-w3m, mm-inline-text)
(mm-insert-inline): Revert last changes.
2014-06-05 04:31:36 +00:00
Katsumi Yamaoka
343d16e40c Gnus: bugfixes to make `gnus-mime-save-part-and-strip' work again
* gnus-art.el (gnus-mm-display-part):
* mm-decode.el (mm-shr):
* mm-view.el (mm-inline-text-html-render-with-w3m, mm-inline-text)
(mm-insert-inline): Set insertion type of end-marker, not only
start-marker, of undisplayer so as to stay after inserted text.
2014-06-05 01:38:42 +00:00
Martin Rudalics
4a52a98a9a In display-buffer-use-some-window don't shrink window used (Bug#17671).
* window.el (display-buffer-use-some-window): Don't make window
used smaller than it was before (Bug#17671).
2014-06-03 14:38:17 +02:00
Eli Zaretskii
0016fa11a7 Minor fix of the last commit in menu-bar-open.
lisp/menu-bar.el (menu-bar-open): Fix last change: use the PC
 '(redisplay)' instead of '(sit-for 0)'.
2014-06-03 12:50:04 +03:00
Rüdiger Sonderfeld
5830a29294 register.el: Add link to Emacs manual in Commentary. 2014-06-03 11:06:18 +02:00
Michael Albinus
a336b2eae3 Fix Bug#17653.
* net/tramp.el (tramp-ssh-controlmaster-options): Improve search regexp.
2014-06-03 09:43:24 +02:00
Glenn Morris
910dc8d312 * lisp/emacs-lisp/package.el (package-pinned-packages): Doc fix.
* etc/NEWS: Related edit.
2014-06-02 21:41:20 -07:00
Sam Steingold
cf3c1e2344 Avoid the type error on f10 when lookup-key returns an number.
* lisp/menu-bar.el (lookup-key-ignore-too-long): Extract from...
(popup-menu): ...here.
(menu-bar-open): Use it to avoid an error when `lookup-key'
returns a number.
2014-06-02 15:02:31 -04:00
Eli Zaretskii
3359086911 Fix TTY menu invocation via M-x.
lisp/menu-bar.el (menu-bar-open): Fix invocation via M-x by forcing
 the update of the menu bar.
2014-06-02 21:58:36 +03:00
Michael Albinus
e915914b93 * net/tramp.el (with-tramp-progress-reporter): Remove traces. 2014-06-02 20:36:47 +02:00
Michael Albinus
7973d8d5fa * net/tramp.el (tramp-handle-unhandled-file-name-directory): Return "/". 2014-06-02 17:17:39 +02:00
Michael Albinus
fd9fba8bd3 * net/tramp.el (with-tramp-progress-reporter): Complete previous patch. 2014-06-02 16:17:07 +02:00
Michael Albinus
bcb1a5bacd * net/tramp.el (with-tramp-progress-reporter): Add more traces. 2014-06-02 16:05:35 +02:00
Michael Albinus
1924ea8c29 * net/tramp.el (with-tramp-progress-reporter, tramp-call-process):
Add traces.
2014-06-02 15:51:35 +02:00
Michael Albinus
9acc8834b3 * net/tramp.el (tramp-call-process): Add more traces. 2014-06-02 13:35:40 +02:00
Michael Albinus
c8291a36aa * lisp/net/tramp.el (tramp-call-process): Add traces. 2014-06-02 11:58:50 +02:00
Wilson Snyder
9e158ac805 Sync with upstream verilog-mode revision 3cd8144
* lisp/progmodes/verilog-mode.el (verilog-mode-version): Bump.
(verilog-auto-arg-format): New option, to support newlines in AUTOARG.
(verilog-type-font-keywords): Add nor.
(verilog-batch-execute-func): Force reading of Local Variables.
Fix printing "no changes to be saved" with verilog-batch.
(verilog-auto-arg-ports): Doc fix.
Add verilog-auto-arg-format to support newlines in AUTOARG.
(verilog-auto-arg): Doc fix.
2014-06-01 23:45:11 -07:00
Glenn Morris
f2ea2ac3f5 * Makefile.in (AUTOGEN_VCS): Fix previous fix 2014-06-01 18:10:47 -07:00
Glenn Morris
3fbc3eff37 ChangeLog typo fix 2014-06-01 18:10:07 -07:00
Glenn Morris
299965685e * lisp/Makefile.in (AUTOGEN_VCS): Update for moved tpu-edu.el 2014-06-01 18:09:34 -07:00
Glenn Morris
4982861a08 Make some old emulation modes obsolete
Ref: http://lists.gnu.org/archive/html/emacs-devel/2014-05/msg00502.html

* lisp/emulation/crisp.el, lisp/emulation/tpu-edt.el:
* lisp/emulation/tpu-extras.el, lisp/emulation/tpu-mapper.el:
* lisp/emulation/vi.el, lisp/emulation/vip.el, lisp/emulation/ws-mode.el:
Move to obsolete/.

* doc/emacs/ack.texi (Acknowledgments): Remove some obsolete items.

* doc/emacs/misc.texi (Emulation): Remove section.

* doc/lispintro/emacs-lisp-intro.texi (Autoload): Update loaddefs.el details.

* doc/misc/efaq.texi (Finding a package with particular functionality):
Update example.

* doc/misc/vip.texi: Mention this is obsolete.

* etc/NEWS: Mention this.
2014-06-01 18:02:21 -07:00
Glenn Morris
953e106ac8 Merge from emacs-24; up to 2014-05-29T17:16:00Z!dmantipov@yandex.ru 2014-06-01 17:18:22 -07:00
Eli Zaretskii
082c97e81f Fix bug #17615 with C-g during macro definition.
lisp/simple.el (keyboard-quit): Force update of mode lines, to remove
 the "Def" indicator, if we were defining a macro.
2014-06-01 18:19:14 +03:00
Glenn Morris
bcbee9833a Auto-commit of loaddefs files. 2014-06-01 07:22:53 -04:00
Glenn Morris
ec0f0d2c4b Auto-commit of loaddefs files. 2014-06-01 06:22:49 -04:00