Commit graph

64251 commits

Author SHA1 Message Date
Michael Albinus
74079cd58b Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs 2015-04-08 11:52:12 +02:00
Michael Albinus
b3f2874de2 Fix nasty scoping bug in tramp-cache.el
* lisp/net/tramp-cache.el (tramp-flush-file-property): Fix nasty scoping bug.
2015-04-08 11:51:22 +02:00
Dmitry Gutov
ba6c32b6de ffap: Support environment variable expansion in file names
Fixes: debbugs:19839

* lisp/ffap.el (ffap-string-at-point-mode-alist): Support
environment variable expansion in file names.
2015-04-08 03:18:38 +03:00
Stefan Monnier
d60dbd81be Fixes: debbugs:20257
* lisp/files.el (set-visited-file-name): Clear auto-save if nil.
2015-04-07 14:56:54 -04:00
Paul Eggert
29500239d3 Add doc strings for some Isearch state vars
* lisp/misearch.el (multi-isearch-buffer-list)
(multi-isearch-file-list): Add doc strings.
Fixes: bug#20232
2015-04-07 10:13:48 -07:00
Alan Mackenzie
db0a3b2c97 Always mark "<" and ">" in #include directives with text properties.
* lisp/progmodes/c-fonts.el (c-cpp-matchers): Replace a font-lock "anchored
matcher" with an invocation of c-make-font-lock-search-function to allow
fontification when there's no trailing space on an "#include <..>" line.
2015-04-07 11:01:43 +00:00
Paul Eggert
2346856168 Generate a ChangeLog file from commit logs
* .gitignore: Add 'ChangeLog'.
* build-aux/gitlog-to-changelog: New file, from Gnulib.
* build-aux/gitlog-to-emacslog: New file.
* CONTRIBUTE: Document the revised workflow.
* Makefile.in (clean): Remove *.tmp and etc/*.tmp*
instead of just special cases.
(CHANGELOG_HISTORY_INDEX_MAX, CHANGELOG_N, gen_origin): New vars.
(ChangeLog, unchanged-history-files, change-history)
(change-history-commit): New rules.
* admin/admin.el (make-manuals-dist--1):
Don't worry about doc/ChangeLog.
* admin/authors.el: Add a FIXME.
* admin/make-tarball.txt:
* lisp/calendar/icalendar.el:
* lisp/gnus/deuglify.el:
* lisp/obsolete/gulp.el:
* lwlib/README:
Adjust to renamed ChangeLog history files.
* admin/merge-gnulib (GNULIB_MODULES): Add gitlog-to-changelog.
* admin/notes/repo: Call it 'master' a la Git, not 'trunk' a la Bzr.
Remove obsolete discussion of merging ChangeLog files.
New section "Maintaining ChangeLog history".
* build-aux/git-hooks/pre-commit:
Reject attempts to commit files named 'ChangeLog'.
* lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate.
* make-dist: Make and distribute top-level ChangeLog if there's a
.git directory.  Distribute the new ChangeLog history files
instead of scattered ChangeLog files.  Distribute the new files
gitlog-to-changelog and gitlog-to-emacslog.
Fixes: bug#19113
2015-04-07 00:00:55 -07:00
Paul Eggert
dd1404cca3 Rename ChangeLogs for gitlog-to-changelog
This patch was implemented via the following shell commands:
find * -name ChangeLog |
sed 's,.*,git mv & &.1,
s, lisp/ChangeLog\.1$, lisp/ChangeLog.17,
s, lisp/erc/ChangeLog\.1$, lisp/erc/ChangeLog.09,
s, lisp/gnus/ChangeLog\.1$, lisp/gnus/ChangeLog.3,
s, lisp/mh-e/ChangeLog\.1$, lisp/mh-e/ChangeLog.2,
s, src/ChangeLog\.1$, src/ChangeLog.13,' |
sh
git commit -am"[this commit message]"
2015-04-07 00:00:06 -07:00
Alan Mackenzie
4d748735d5 Fix miscellaneous glitches in cc-mode.el. Fixes debbugs#20245.
* progmodes/cc-mode.el (c-common-init): bind
\(before\|after\)-change-functions to nil around invocations of
c-get-state-before-change-functions and
c-before-font-lock-functions to prevent recursive invocations.
(c-neutralize-syntax-in-and-mark-CPP): On c-beginning-of-macro,
check that point has actually moved back.
(c-fl-decl-start): Check whether c-beginning-of-decl-1 has
actually found a boundary (as contrasted with hitting a search
limit).
2015-04-06 22:23:30 +00:00
Alan Mackenzie
b31d359d18 CC Mode: Stop Font Lock forcing fontification from BOL. Fixes debbugs#19669.
cc-mode.el (c-font-lock-init): Setq font-lock-extend-region-functions to
nil.
2015-04-06 22:23:29 +00:00
Fabián Ezequiel Gallina
ab9252a01a python.el: Do not break IPython magic completions.
Fixes: debbugs:19736

* lisp/progmodes/python.el (python-shell-completion-setup-code):
Cleaner setup; import rlcompleter as last resource.
2015-04-06 19:18:46 -03:00
Artur Malabarba
c91fd97dfb * emacs-lisp/package.el: Make the execute prompt less verbose.
(package-menu--list-to-prompt): New function.
(package-menu--prompt-transaction-p): Use "Upgrade" to make the
package-menu-execute prompt less verbose.
2015-04-06 17:09:43 +01:00
Artur Malabarba
67c152efc3 * emacs-lisp/package.el: Fix lack of "new" packages.
(package-menu--new-package-list)
(package-menu--old-archive-contents): No longer local.
2015-04-06 16:22:07 +01:00
Artur Malabarba
7471fc47b4 emacs-lisp/package.el (package-menu-execute): Add async support
Most install/delete logic is now in
`package-menu--perform-transaction', and this function is called
asynchronously if `package-menu-async' is non-nil.
2015-04-06 11:19:04 +01:00
Artur Malabarba
6701726b98 emacs-lisp/package.el (package-install): Add ASYNC and CALLBACK 2015-04-06 11:19:04 +01:00
Artur Malabarba
b6610d5547 emacs-lisp/package.el: Refactor pre-execute prompt 2015-04-06 11:19:04 +01:00
Artur Malabarba
7436b68132 emacs-lisp/package.el: Async support in download-transaction 2015-04-06 11:19:04 +01:00
Paul Eggert
b884ff380d Spelling fix for 'hfy-optimizations'
* htmlfontify.el (hfy-optimizations): Rename from hfy-optimisations,
with an obsolete alias.  All uses changed.
2015-04-05 23:43:22 -07:00
Paul Eggert
93ce8b3309 Fix typo in previous rtree change 2015-04-05 23:33:22 -07:00
Paul Eggert
1f3f5f1441 Use American spelling for 'normalize'
* rtree.el (rtree-normalize-range): Rename from rtree-normalise-range.
All uses changed.  Add an alias for obsolete usages.
2015-04-05 21:58:01 -07:00
Fabián Ezequiel Gallina
cf7b034ee1 Fix previous commit to prevent infloop 2015-04-06 01:22:19 -03:00
Fabián Ezequiel Gallina
deea36f0ec python.el: Enhance docstring detection following PEP-257.
* lisp/progmodes/python.el (python-docstring-at-p): Remove function.
(python-info-assignment-statement-p): New function.
(python-info-assignment-continuation-line-p): Use it.
(python-info-docstring-p): New function.
(python-font-lock-syntactic-face-function)
(python-fill-string): Use it.

* test/automated/python-tests.el (python-info-assignment-statement-p-1)
(python-info-assignment-statement-p-2)
(python-info-assignment-statement-p-3, python-info-docstring-p-1)
(python-info-docstring-p-2, python-info-docstring-p-3)
(python-info-docstring-p-4, python-info-docstring-p-5)
(python-info-docstring-p-6): New tests.
2015-04-05 23:58:13 -03:00
Eli Zaretskii
ba0a6e9f28 Fix byte-compilation warning in lisp/ses.el
lisp/ses.el (ses-sym-rowcol): Move up, before the first use, to avoid
 byte-compiler warnings.
2015-04-05 20:18:19 +03:00
Alan Mackenzie
c1d18b1d59 Tidy up fix to debbugs#20240.
* jit-lock.el (jit-lock-after-change): Widen the buffer only
whilst putting the 'fontified text properties.
2015-04-05 14:40:57 +00:00
Eli Zaretskii
bf8194688e Fix lisp/ChangeLog formatting. 2015-04-05 16:05:31 +03:00
Alan Mackenzie
2056db3fad Rationalize use of c[ad]+r, expunging cl-c[ad]\{3,4\}r.
Also expunge eudc-c[ad]+r.

* subr.el (internal--compiler-macro-cXXr): "New" function, copied
from cl--compiler-macro-cXXr.
(caar, cadr, cdar, cddr): Change from defsubsts to defuns with
the above compiler-macro.

* net/eudc.el (eudc-cadr, eudc-cdar, eudc-caar, eudc-cdaar): Remove.

* emacs-lisp/cl.el (Top level dolist doing defaliases): Remove
caaar, etc., from list of new alias functions.

* emacs-lisp/cl-lib.el (cl-caaar, etc): Rename to caaar, etc.
(gen-cXXr--rawname, gen-cXXr-all-cl-aliases): New function/macro
which generate obsolete cl- aliases for caaar, etc.  Invoke them.

* desktop.el:
* edmacro.el:
* emacs-lisp/cl-macs.el:
* frameset.el:
* ibuffer.el:
* mail/footnote.el:
* net/dbus.el:
* net/eudc-export.el:
* net/eudc.el:
* net/eudcb-ph.el:
* net/rcirc.el:
* net/secrets.el:
* play/5x5.el:
* play/decipher.el:
* play/hanoi.el:
* progmodes/hideif.el:
* ses.el: Replace cl-caaar, eudc-cadr, etc. with caaar and cadr, etc.
2015-04-05 12:49:14 +00:00
Richard Stallman
5842e489ee Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
Conflicts:
	lisp/ChangeLog
2015-04-05 08:44:01 -04:00
Richard Stallman
4e23cd0ccd * mail/rmail.el (rmail-show-message-1): When displaying a mime message,
indicate start and finish in the echo area.

       * mail/rmail.el (rmail-epa-decrypt): Disregard <pre> before armor.
       Ignore more kinds of whitespace in mime headers.
       Modify the decrypted mime part's mime type so it will be displayed
       by default when visiting this message again.

       * net/browse-url.el (browse-url-firefox-program): Prefer IceCat, doc.
       (browse-url-firefox-arguments)
       (browse-url-firefox-startup-arguments): Doc fix.
2015-04-05 08:42:43 -04:00
Artur Malabarba
fdc521952e emacs-lisp/package.el: Add package-initialize to user-init-file. 2015-04-05 11:06:20 +01:00
Artur Malabarba
b47fe819f7 emacs-lisp/package.el: Prevent outdated downloads-in-progress. 2015-04-05 10:59:18 +01:00
Pete Williamson
b79bcfd34f Fix .emacs and .emacs.d/init file recursion problem for NaCl
* files.el (file-truename): Add NaCl to the exception list ms-dos uses.
2015-04-04 20:19:21 -07:00
Paul Eggert
207f119357 Merge from origin/emacs-24
21d4bf6 * admin/make-tarball.txt: Copyedits.
f3b70a7 ; ChangeLog fix
07432a8 Revert "CC Mode: Stop Font Lock forcing fontification from BOL."

Conflicts:
	lisp/ChangeLog
2015-04-04 15:02:09 -07:00
Artur Malabarba
b32bb3f2f6 (package--with-work-buffer-async): Protect macro arguments. 2015-04-04 20:44:59 +01:00
Artur Malabarba
f674de6f08 emacs-lisp/package.el: Don't overwrite downloads-in-progress. 2015-04-04 20:22:26 +01:00
Michael Albinus
5824dd5b6a Quote directory name in tramp-flush-directory-property
* net/tramp-cache.el (tramp-flush-directory-property): Quote directory
name when used in regexp.
2015-04-04 20:34:47 +02:00
Alan Mackenzie
4fabcbfbcd Fix debbugs#20240 part two (jit-lock error during `comment-dwim').
jit-lock.el (jit-lock-after-change): Widen the buffer before
putting 'fontified text properties.
2015-04-04 10:32:23 +00:00
Michael Albinus
8596eb1282 Fix Bug#20249
Fixes: debbugs:20249

* net/tramp-cache.el (tramp-flush-file-property)
(tramp-flush-directory-property): Use `directory-file-name' of the
truename.
2015-04-03 18:52:27 +02:00
Glenn Morris
f3b70a795b ; ChangeLog fix 2015-04-03 11:11:15 -04:00
Alan Mackenzie
07432a8c2d Revert "CC Mode: Stop Font Lock forcing fontification from BOL. Bug#19669."
This reverts commit d69e9f1c24.
2015-04-03 12:22:45 +00:00
Nicolas Richard
7c691f32f7 pcmpl-ssh-known-hosts: Use char-before' instead of looking-back'.
Fixes: debbugs:17284

* lisp/pcmpl-unix.el (pcmpl-ssh-known-hosts): Use `char-before' instead
of `looking-back'.
2015-04-03 13:57:42 +02:00
Dmitry Gutov
0b914bada3 ; Tweak the previous change 2015-04-03 07:13:14 +03:00
Dmitry Gutov
f2fbd4b712 js-mode: Don't indent inside a multiline string literal
* lisp/progmodes/js.el (js-indent-line): Do nothing when bol is inside
a string (https://github.com/mooz/js2-mode/issues/227).
2015-04-03 06:37:31 +03:00
Katsumi Yamaoka
839decd9ec lisp/gnus/gnus-art.el (gnus-article-browse-html-parts): Make external links absolute and cid file names relative 2015-04-03 03:18:52 +00:00
Stefan Monnier
0c2ea36d20 * lisp/abbrev.el (define-abbrev-table): Treat a non-string "docstring" as
part of the "props" arguments rather than silently ignoring it.
2015-04-02 10:00:48 -04:00
Stefan Monnier
5e41a51e5c * lisp/emacs-lisp/lisp-mnt.el (lm-version): Don't burp in a non-file buffer. 2015-04-02 09:59:47 -04:00
Alan Mackenzie
23bb07e05d Fix the CC Mode fixes from 2015-03-30. Fixes debbugs#20240.
* progmodes/cc-mode.el (c-extend-after-change-region): Widen before
applying text properties.
* progmodes/cc-langs.el (c-before-font-lock-functions): Update an entry
to a new function name.
2015-04-01 19:12:07 +00:00
Paul Eggert
bd55cd4d24 * emacs-lisp/package.el: Spelling fixes and use active voice. 2015-04-01 10:22:20 -07:00
Glenn Morris
76b1a1f4eb ; Auto-commit of loaddefs files. 2015-04-01 06:21:35 -04:00
Artur Malabarba
aa33f4a100 * emacs-lisp/package.el: Make package-menu asynchronous.
(package-menu-async): New variable.  Controls whether
`list-packages' is asynchronous.
(list-packages): Now asynchronous by default.
(package-menu--new-package-list): Always buffer-local.
(package-menu--post-refresh)
(package-menu--find-and-notify-upgrades)
(package-menu--populate-new-package-list): New functions.
2015-04-01 11:09:00 +01:00
Artur Malabarba
ba7a1a7a4e * emacs-lisp/package.el: Implement asynchronous refreshing.
(package--with-work-buffer-async)
(package--check-signature-content)
(package--update-downloads-in-progress): New functions.
(package--check-signature, package--download-one-archive)
(package--download-and-read-archives, package-refresh-contents):
Optional arguments for async usage.
(package--post-download-archives-hook): New variable. Hook run
after every refresh.
2015-04-01 11:08:03 +01:00