summaryrefslogtreecommitdiff
path: root/lisp
Commit message (Collapse)AuthorAgeFilesLines
* Handle multiple matches on the same line; add highlightingscratch/xref-nextDmitry Gutov2015-11-101-21/+23
|
* Replace xref-match-bounds with xref-match-lengthDmitry Gutov2015-11-101-52/+47
|
* ; project-library-roots-function: Update the FIXMEDmitry Gutov2015-11-101-2/+3
|
* Fix some recently-perturbed bookmark autoloadsKarl Fogel2015-11-091-1/+2
| | | | | | | | | | * lisp/bookmark.el (bookmark-set-internal): Remove unnecessary autoload. (bookmark-set): Restore autoload. (bookmark-set-no-overwrite): Add autoload. Thanks to Juanma Barranquero for noticing the autoload problems introduced by my recent commit adding/changing the above functions (Sun Nov 8 14:16:43 2015 -0500, git commit 3812e17978).
* * lisp/progmodes/project.el: Update Commentary.Dmitry Gutov2015-11-101-1/+2
|
* Merge branch 'project-next'Dmitry Gutov2015-11-106-150/+182
|\
| * Fold `project-ask-user' into `project-current'Dmitry Gutov2015-11-103-16/+22
| | | | | | | | | | | | | | | | | | | | * lisp/progmodes/project.el (project-find-functions): Remove `project-ask-user'. (project-ask-user): Remove function and the corresponding `project-roots' implementation. (project-current): Add a new argument, MAYBE-PROMPT. Prompt the user in case there's no project in the current directory. Update all callers.
| * Make sure that the ignore file existsproject-nextDmitry Gutov2015-11-091-2/+3
| | | | | | | | | | * lisp/vc/vc.el (vc-default-ignore-completion-table): Make sure that the ignore file exists.
| * Remove dirs in vc project roots from the the vc project library rootsDmitry Gutov2015-11-081-6/+9
| | | | | | | | | | | | * lisp/progmodes/project.el (project-library-roots): Remove directories inside the project roots from the result. (http://lists.gnu.org/archive/html/emacs-devel/2015-11/msg00536.html)
| * ; project-library-roots: Update docstringDmitry Gutov2015-11-081-3/+3
| |
| * Move and rename xref-find-regexp to the project packageDmitry Gutov2015-11-082-44/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | * lisp/progmodes/project.el (project-find-regexp) (project--read-regexp) (project--find-regexp-in): New functions. * lisp/progmodes/xref.el (xref--find-xrefs): Extract from xref--show-xrefs. Use in existing callers in place of that function. (xref--show-xrefs): Only do the "show" part. (xref-find-regexp): Rename, more or less, to project-or-libraries-find-regexp.
| * Abolish temporary buffer management for xrefDmitry Gutov2015-11-061-41/+6
| | | | | | | | | | | | | | | | | | * lisp/progmodes/xref.el (xref--temporary-buffers) (xref--current) (xref--inhibit-mark-current) (xref--mark-selected): Remove. Remove all references. (xref--show-xrefs): Do not construct the list of the temporary buffers, nor pass it along.
| * Rename "search path" to "library roots"Dmitry Gutov2015-11-065-53/+85
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * lisp/emacs-lisp/cl-seq.el (cl-set-difference): Retain the order of the elements from CL-LIST1. * test/automated/cl-lib-tests.el (cl-lib-test-set-functions): Update WRT to the above change. * lisp/progmodes/project.el (project-search-path-function): Rename to project-library-roots-function, update the documentation and references. (project-search-path): Likewise, to project-library-roots. (project-roots): Clarify documentation. (project-vc-search-path): Likewise, to project-vc-library-roots. (project-library-roots): In addition to the renames, thread the results through file-name-as-directory. (project-prune-directories): Accept a variable number of arguments. Rename to project-combine-directories. (project-subtract-directories): New function. * lisp/progmodes/elisp-mode.el (elisp--xref-find-references): Append project-roots and project-library-roots together. * lisp/progmodes/etags.el (etags--xref-find-references): Ditto.
* | When VC detects a conflict, specify which fileKarl Fogel2015-11-095-4/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * lisp/vc/vc.el (vc-message-unresolved-conflicts): New function. * lisp/vc/vc-svn.el (vc-svn-find-file-hook): * lisp/vc/vc-hg.el (vc-hg-find-file-hook): * lisp/vc/vc-bzr.el (vc-bzr-find-file-hook): * lisp/vc/vc-git.el (vc-git-find-file-hook): Use above new function to display a standard message that specifies the conflicted file. Before this change, the message VC used for indicating a conflicted file was just "There are unresolved conflicts in this file" without naming the file (and this language was duplicated in several places). After this change, it's "There are unresolved conflicts in file FOO" (and this language is now centralized in one function in vc.el). Justification: It's important for the message to name the conflicted file because the moment when VC realizes a file is conflicted does not always come interactively. For example, some people automatically find a set of Org Mode files on startup, and may keep those .org files under version control. If any of the files are conflicted, the user just sees some messages fly by, and might later check the "*Messages*" buffer to find out what files were conflicted. I'm not saying this happened to me or anything; it's a purely hypothetical example.
* | * gnus-sum.el (gnus-summary-backend-map): Bind B-backspace toMichael Sperber2015-11-091-0/+1
| | | | | | | | `gnus-summary-delete-article` in a way that also works on XEmacs.
* | Add support for retrieving paths to JSON elementsSimen Heggestøyl2015-11-081-0/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for retrieving the path to a JSON element. This can for instance be useful to retrieve paths in deeply nested JSON structures. * lisp/json.el (json-pre-element-read-function) (json-post-element-read-function): New variables to hold pre- and post read callback functions for `json-read-array' and `json-read-object'. (json--path): New variable used internally by `json-path-to-position'. (json--record-path, json--check-position): New functions used internally by `json-path-to-position'. (json-path-to-position): New function for retrieving the path to a JSON element at a given position. (json-read-object, json-read-array): Call `json-pre-element-read-function' and `json-post-element-read-function' when set. * test/automated/json-tests.el (test-json-path-to-position-with-objects) (test-json-path-to-position-with-arrays) (test-json-path-to-position-no-match): New tests for `json-path-to-position'.
* | Offer non-overwrite bookmark setter (Bug#15746)Karl Fogel2015-11-081-26/+89
| | | | | | | | | | | | | | | | | | | | | | * lisp/bookmark.el (bookmark-set-internal): New helper function to do what `bookmark-set' used to do, but with more choices for overwrite vs push, and with minor changes to the interactive prompt format. (bookmark-set): Rewrite as wrapper around above. If overwriting, inform the user of that in the prompt. (bookmark-set-no-overwrite): New function, also done as wrapper. Bind to "M" in `ctl-x-r-map' autoloads. (bookmark-map): Similarly bind "M" here.
* | Fix Bug#21841Michael Albinus2015-11-081-14/+24
| | | | | | | | | | | | | | | | * lisp/filenotify.el (file-notify--rm-descriptor): Use `descriptor' instead of computing its value. (file-notify--descriptor): Additional argument FILE. Adapt all callees. (file-notify-rm-watch): Use `descriptor' when calling file name handler. (Bug#21841)
* | erc-pcomplete.el (pcomplete-erc-nicks): Fix bug#18771l3thal2015-11-072-3/+9
| |
* | ; * lisp/abbrev.el (copy-abbrev-table): Remove forgotten debug code.Eli Zaretskii2015-11-071-1/+0
| |
* | Speed up lookup in redisplay--variablesEli Zaretskii2015-11-071-2/+4
| | | | | | | | | | | | | | | | | | | | | | * lisp/frame.el (redisplay--variables): Make it a hash-table. * src/xdisp.c (maybe_set_redisplay): Access redisplay--variables as a hash-table. This speeds up this function by an order of magnitude: where previously a setq was slowed down by 100% by introducing the maybe_set_redisplay test, it is now only 5% slower. (syms_of_xdisp) <redisplay--variables>: Doc fix.
* | * lisp/emacs-lisp/cl-macs.el (cl-defstruct): Fix a bugArtur Malabarba2015-11-071-1/+1
| | | | | | | | | | | | | | The defsubst was being created as: (cl-defsubst name (args) ("DOC") ...) * test/automated/cl-lib-tests.el (cl-lib-struct-constructors): Add test
* | Update doc string of hexl-modeMihai Olteanu2015-11-071-1/+1
| | | | | | | | | | | | * lisp/hexl.el (hexl-mode): Doc fix. (Bug#21800) Copyright-paperwork-exempt: yes
* | Fix error in copy-abbrev-tableEli Zaretskii2015-11-071-0/+3
| | | | | | | | | | | | | | * lisp/abbrev.el (define-abbrev): Don't erase the :abbrev-table-modiff property of the abbrev-table. (Bug#21828) * test/automated/abbrev-tests.el: New file.
* | Ensure redisplay after evaluationEli Zaretskii2015-11-062-11/+10
| | | | | | | | | | | | | | | | | | | | | | * lisp/progmodes/elisp-mode.el (elisp--eval-last-sexp): Revert last change. * lisp/frame.el (redisplay--variables): Populate the redisplay--variables list. * src/xdisp.c (maybe_set_redisplay): New function. (syms_of_xdisp) <redisplay--variables>: New variable. * src/window.h (maybe_set_redisplay): Declare prototype. * src/data.c (set_internal): Call maybe_set_redisplay. (Bug#21835)
* | Ensure redisplay after "C-x C-e"Eli Zaretskii2015-11-061-4/+11
|/ | | | | | * lisp/progmodes/elisp-mode.el (elisp--eval-last-sexp): Make sure redisplay happens to account for any side effects of the evaluated sexp. (Bug#21835)
* * lisp/progmodes/xref.el: require semantic/symref during compilation.Stephen Leake2015-11-061-0/+3
|
* Suppress redundant Pinentry startup messagesDaiki Ueno2015-11-062-4/+10
| | | | | | | * lisp/net/pinentry.el (pinentry-start): Add optional QUIET argument. * lisp/epg.el: Declare `pinentry-start'. (epg--start): Call `pinentry-start' with QUIET argument set.
* Add prettify symbol for \timesTassilo Horn2015-11-051-0/+1
| | | | | * lisp/textmodes/tex-mode.el (tex--prettify-symbols-alist): Add prettification support for \times.
* ; Auto-commit of loaddefs files.Glenn Morris2015-11-051-1/+1
|
* * lisp/emacs-lisp/eieio-compat.el: Typo caught by testsStefan Monnier2015-11-041-1/+1
| | | | | | (eieio--generic-static-object-generalizer): Fix typo. * test/automated/eieio-tests.el: Byte-compile it again. It looks like the underlying cause of bug#17852 was fixed in the mean time.
* Revert "* lisp/subr.el (when): Use `macroexp-progn'"Artur Malabarba2015-11-041-1/+1
| | | | | This reverts commit 8e843831eaf271801836b7a3e4dd3b4fb0bb72b8. It breaks bootstrapping (duh).
* * lisp/files.el (report-errors): ObsoleteArtur Malabarba2015-11-041-15/+4
| | | | | (normal-mode, hack-local-variables, dir-locals-find-file): Use `with-demoted-errors' instead.
* * lisp/subr.el (when): Use `macroexp-progn'Artur Malabarba2015-11-041-1/+1
| | | | * test/automated/subr-tests.el (subr-test-when): New test
* * lisp/progmodes/xref.el: Doc fixesJuanma Barranquero2015-11-041-6/+6
| | | | | | (xref-make-file-location, xref-make-buffer-location, xref-make) (xref-make-bogus-location, xref-make-match): Add cross-references. (xref--insert-xrefs): Fix typo in docstring.
* * lisp/emacs-lisp/pcase.el (pcase): Tweak docstring.Michael Heerdegen2015-11-031-4/+4
|
* Change maintainer address.Jay Belanger2015-11-0343-46/+1
| | | | * lisp/calc/calc (calc-bug-address): Change address.
* * lisp/progmodes/f90.el (f90-no-block-limit):Glenn Morris2015-11-011-1/+1
| | | | | Add associate. (Bug#21794) * test/automated/f90.el (f90-test-bug21794): New test.
* Improve completion in tramp-gvfs.elMichael Albinus2015-11-012-29/+68
| | | | | | | | | | | | | * lisp/net/tramp-gvfs.el (tramp-zeroconf-parse-device-names): Renamed from `tramp-zeroconf-parse-service-device-names'. (tramp-zeroconf-parse-webdav-device-names): Removed. Code merged with `tramp-zeroconf-parse-device-names'. (tramp-gvfs-parse-device-names): New defun. (top): Use it when `tramp-zeroconf-parse-device-names' is not applicable. * lisp/net/tramp.el (tramp-set-completion-function): The argument could also be a zeroconf service type.
* ; Auto-commit of loaddefs files.Glenn Morris2015-11-011-253/+278
|
* ntlm.el: Change version to 2.0.0Thomas Fitzsimmons2015-10-311-1/+1
|
* Fix bug#21762Juanma Barranquero2015-11-011-2/+2
| | | | | | | | | * lisp/progmodes/python.el (python-syntax-closing-paren-p): Check with `eql' instead of `=' to accommodate the case that (syntax-after (point)) returns nil. * test/automated/python-tests.el (python-indent-inside-paren-7): New test.
* Add JSX indentation via js-jsx-mode. (Bug#21799)Jackson Ray Hamilton2015-10-311-0/+221
| | | | | | * progmodes/js.el: Add JSX indentation support. (js-jsx-indent-line) (js-jsx-mode): New functions.
* Merge branch 'master' of git.sv.gnu.org:/srv/git/emacsMichael Albinus2015-10-311-1/+1
|\
| * Avoid errors in redisplay--pre-redisplay-functionsEli Zaretskii2015-10-311-1/+1
| | | | | | | | | | * lisp/emacs-lisp/cursor-sensor.el (cursor-sensor--detect): Don't use 'bobp', instead compare window-point with 1. (Bug#21730)
* | Minor fix in filenotify.elMichael Albinus2015-10-311-5/+7
|/ | | | | | * lisp/filenotify.el (file-notify--event-file-name) (file-notify--event-file1-name): Normalize result with `directory-file-name'.
* * lisp/faces.el (faces--attribute-at-point): Fix bugArtur Malabarba2015-10-301-6/+7
| | | | introduced by previous commit.
* * lisp/faces.el: Refactor common code and fix a bugArtur Malabarba2015-10-301-28/+30
| | | | | | | (faces--attribute-at-point): New function. Fix a bug when the face at point is a list of faces and the desired attribute is not on the first one. (foreground-color-at-point, background-color-at-point): Use it.
* * lisp/character-fold.el: Provide `character-fold'Juanma Barranquero2015-10-301-0/+2
|
* Some minor fixes for tramp-gvfs.elMichael Albinus2015-10-301-42/+35
| | | | | | | | | * lisp/net/tramp-gvfs.el (tramp-gvfs-handle-file-attributes): An attribute returned by gvfs-info might be empty. In case of undetermined uid or gid, return "UNKNOWN" or -1, respectively. (tramp-zeroconf-parse-service-device-names): New defun. Derived from `tramp-zeroconf-parse-workstation-device-names'. (top): Add completion functions for "afp" and "smb" methods.