diff options
author | John Wiegley <johnw@newartisans.com> | 2016-01-11 22:51:27 -0800 |
---|---|---|
committer | John Wiegley <johnw@newartisans.com> | 2016-01-11 22:51:27 -0800 |
commit | c7bef6a4f033fa6b22906de0be6da54958d5b3c3 (patch) | |
tree | 3a0f34b340ad01de290f068530c27f35aba83724 /lisp/ffap.el | |
parent | f5d90b5fcf0251466055c7dbed6069c1850d802d (diff) | |
parent | 1f6898d0510cd15455f665c0f38451755a374243 (diff) | |
download | emacs-c7bef6a4f033fa6b22906de0be6da54958d5b3c3.tar.gz |
Merge from origin/emacs-25
1f6898d test/automated/vc-hg.el: Support out-of-tree build
3adb56e Minor change in tramp-tests.el
2b535ba ; * etc/NEWS: Update the js.el entry.
76b518c * etc/HELLO: Add Armenian and Mongolian greetings.
b51f1ef Java Mode: Fontify identifiers in the presence of annotations.
36b9539 Avoid an infloop when we run out of memory
2006752 Avoid unnecessary failures of auto-saving after fatal error
eef6784 Simplify HAVE_MODULES use in mark_maybe_pointer
552694a Revert attempt to use 'noexcept' in typedef
6ad0d39 Update documentation of 'indirect-function'
c6a5314 ; * etc/NEWS: Move entry of 'inhibit-point-motion-hooks'.
303141a Update documentation for obsoleting 'syntax-begin-function'
4e6f61c ; * etc/NEWS: Mark documented and not-to-be-documented entries.
e667bbb Document new features if Eshell
9c4e4e0 ; * etc/NEWS: Update EUDC entries.
1089dc9 Handle too long commands in Tramp
684eb58 * .gitattributes: *.cur and *.pif are binary files too.
d2c7fda * src/alloc.c (mark_maybe_pointer): HAVE_MODULES may be undefined
bd3f53d * sh-script.el (sh-smie-sh-rules): Improve indentation inside $(...)
09b2b8a * src/alloc.c (mark_maybe_pointer): Also check wide-int's emacs_value
cca0f93 ; Account for spaces before the filename
c71e1e8 Use short date for 'hg annotate', and output the author
f50027b Spelling fix
c7dff67 ; * etc/NEWS: Fix the Xref entries that got separated.
cc140bc Document user-level functions in project.el
f8208b6 Document the user-level features of the Xref package
b131fb8 * loading.texi: Add `define-type' entry for load-history
db3c2a8 Improve doc strings and prompts in xref.el
f6117ef Allow the use of `font-lock-extend-region-multiline' in CC Mode.
90fd798 Fix coding system for Tramp on OS X.
e985a0e ; * etc/NEWS: Mark the 'check-expensive' entry not to be documented.
9dfcbf0 Update 'load-history' docs
207e191 Fix (error ...) error
457738f Correctly analyze brace arguments in templated C++ function declarations.
d57724a * lisp/cedet/mode-local.el (describe-function-orig-buffer): Declare.
2a9532d * lisp/ffap.el (ffap-latex-mode): Avoid free variable.
1a6b084 * lisp/play/dunnet.el (dun-fix-screen): Avoid `end-of-buffer`.
8be046f Respect fontification region calculated by major mode. Fixes bug #22316.
4b37cba Improve documentation of Delete Selection mode
a034dd3 Fix two project-find-file issues
30abf29 Clarify doc string of 'dired-current-directory'
e990bb2 Use the face of preceding text for displaying the ellipsis
5810ac3 Suppress Chinese file name test for OSX in tramp-tests.el
eeb710a ; * lisp/startup.el: Sentences end with two spaces.
428b3de * admin/admin.el (set-version): Also handle the NEWS file.
648de81 ; Add NEWS entry for project.el
671862f apropos-library: Skip obvious duplicates; don't error on generics
51668a5 ; Grammar fix
ed41d11 Add project-find-file and project-or-external-find-file
056da45 ; Improve commentary in 'setup_for_ellipsis'
269d008 ; Improve docstring for `inhibit-startup-echo-area-message'
Diffstat (limited to 'lisp/ffap.el')
-rw-r--r-- | lisp/ffap.el | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lisp/ffap.el b/lisp/ffap.el index 6c7932b512e..abf979f6129 100644 --- a/lisp/ffap.el +++ b/lisp/ffap.el @@ -974,14 +974,14 @@ out of NAME." (push (cons "" (cdr (assoc (match-string 0) ; i.e. "(TeX-current-macro)" preferred-suffix-rules))) guess-rules)) - (setq kpsewhich-args (mapcar (lambda (rule) - (concat (car rule) name (cdr rule))) - guess-rules)) (with-temp-buffer (let ((process-environment (buffer-local-value 'process-environment curbuf)) (exec-path (buffer-local-value 'exec-path curbuf))) - (apply #'call-process "kpsewhich" nil t nil kpsewhich-args)) + (apply #'call-process "kpsewhich" nil t nil + (mapcar (lambda (rule) + (concat (car rule) name (cdr rule))) + guess-rules))) (when (< (point-min) (point-max)) (buffer-substring (goto-char (point-min)) (point-at-eol)))))))) |