commit d149ca81c33ab95900306c3c71f6eff62a3ec1a1 Author: Artur Malabarba AuthorDate: Tue Nov 10 05:47:42 2015 Commit: Artur Malabarba CommitDate: Tue Nov 10 06:45:50 2015 * doc/lispref/variables.texi (Directory Local Variables): Document dir-locals wildcards * lisp/files.el (dir-locals-file): Point to Info node. * doc/emacs/custom.texi (Directory Variables): Document dir-locals wildcards. * etc/NEWS: Document new functionality. commit 9145e79dc2042fb477959ddda59c3e2ff5fa3914 Author: Artur Malabarba AuthorDate: Tue Nov 10 05:26:00 2015 Commit: Artur Malabarba CommitDate: Tue Nov 10 05:26:00 2015 * lisp/files.el: Don't allow customization of dir-locals sorting In retrospect, this is not a good idea for the same reason that `dir-locals-file' is a defconst, because it is important that this behaviour be "uniform across different environments and users". Sure, the user can still change the sorting with a hack, but we shouldn't encourage them to change it. (dir-locals--all-files): Return list in the order returned by `file-expand-wildcards'. (file-expand-wildcards): Document the sorting predicate used. (dir-locals-sort-predicate): Delete variable. commit 77cebbc1e77edf23bc2c23a218b56d9d6ad68e74 Author: Artur Malabarba AuthorDate: Tue Nov 10 05:14:49 2015 Commit: Artur Malabarba CommitDate: Tue Nov 10 05:14:49 2015 * lisp/files.el (dir-locals-read-from-file): Better handle errors commit 4d82aa3abdad1871b99f0a9e56fe54ec497bd290 Author: Artur Malabarba AuthorDate: Tue Nov 10 05:04:02 2015 Commit: Artur Malabarba CommitDate: Tue Nov 10 05:04:31 2015 * lisp/isearch.el (search-default-regexp-mode): change default value commit 1e98f041acae7cee012b1b157d4aa3f80b226123 Author: Artur Malabarba AuthorDate: Mon Nov 9 20:13:25 2015 Commit: Artur Malabarba CommitDate: Tue Nov 10 05:04:31 2015 * lisp/files.el (dir-locals-find-file): Don't stop at unreadable files `locate-dominating-file' will now keep looking if the files it finds in a given directory are unreadable (or not files). commit 2e8488858c7b8df40610c1cd3038348fdc9bf3ed Author: Artur Malabarba AuthorDate: Sat Nov 7 05:54:56 2015 Commit: Artur Malabarba CommitDate: Tue Nov 10 05:04:31 2015 * lisp/files.el (dir-locals-file): Allow wildcards (dir-locals-find-file, dir-locals-collect-variables) (dir-locals-read-from-file): Update accordingly. (hack-dir-local-variables): Rename a local variable. * lisp/files-x.el (modify-dir-local-variable): Update accordingly * lisp/help-fns.el (describe-variable): Update accordingly * .gitignore: Add .dir-locals?.el commit cbaa04014e0c9efdfc6393bccde0e6579b5d7051 Author: Artur Malabarba AuthorDate: Sat Nov 7 04:45:18 2015 Commit: Artur Malabarba CommitDate: Tue Nov 10 05:04:30 2015 * lisp/emacs-lisp/map.el (map-merge-with): New function * test/automated/map-tests.el (test-map-merge-with): New test commit cbc51211f9e4f8f3d4b8a1feaa6cbfd2fd4ac1ca Author: Dmitry Gutov AuthorDate: Mon Nov 9 18:39:32 2015 Commit: Dmitry Gutov CommitDate: Tue Nov 10 03:31:20 2015 ; project-library-roots-function: Update the FIXME commit 0f50e5163cf747fcf18124039a82b5156a48316b Author: Karl Fogel AuthorDate: Mon Nov 9 20:14:49 2015 Commit: Karl Fogel CommitDate: Mon Nov 9 20:14:54 2015 Fix some recently-perturbed bookmark autoloads * 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). commit f5eac7baefacd8944a1851596a944fd29dec98fa Author: Noah Friedman AuthorDate: Mon Nov 9 17:34:40 2015 Commit: Noah Friedman CommitDate: Mon Nov 9 17:34:40 2015 (ydump-buffer): Handle case where gap is at the start of buffer. I don't recall if older versions of gdb were less strict but you cannot dump a 0-length range in gdb 7.9.1. commit 82d59f1b3ba6d7ad9d9cd0af15e237f97bb5906b Author: Dmitry Gutov AuthorDate: Mon Nov 9 16:56:55 2015 Commit: Dmitry Gutov CommitDate: Mon Nov 9 16:56:55 2015 * lisp/progmodes/project.el: Update Commentary. commit 0be6fb8e17f708fe03430d0b1e701810ae51b5e3 Merge: 3c3aad7 1c72afb Author: Dmitry Gutov AuthorDate: Mon Nov 9 16:47:46 2015 Commit: Dmitry Gutov CommitDate: Mon Nov 9 16:47:46 2015 Merge branch 'project-next' commit 1c72afb7aa48c2ea06103113ef70ccea0c1c961d Author: Dmitry Gutov AuthorDate: Mon Nov 9 16:41:06 2015 Commit: Dmitry Gutov CommitDate: Mon Nov 9 16:41:06 2015 Fold `project-ask-user' into `project-current' * 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. commit 3c3aad733522365a8fe729d7c92e64e98bc4ce92 Author: Karl Fogel AuthorDate: Mon Nov 9 13:57:23 2015 Commit: Karl Fogel CommitDate: Mon Nov 9 13:57:29 2015 When VC detects a conflict, specify which file * 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. commit 86c19714b097aa477d339ed99ffb5136c755a046 Author: Eli Zaretskii AuthorDate: Mon Nov 9 10:31:45 2015 Commit: Eli Zaretskii CommitDate: Mon Nov 9 10:31:45 2015 Fix assertion violation in define-key * src/keymap.c (store_in_keymap): Don't use XFASTINT on non-character objects. Reported by Drew Adams and Juanma Barranquero . commit c6c16fb3f8fe5909baafd53c6b26153dec021064 Author: Dima Kogan AuthorDate: Mon Nov 9 08:36:05 2015 Commit: Eli Zaretskii CommitDate: Mon Nov 9 08:36:05 2015 Fix a memory leak in GC of font cache * src/alloc.c (compact_font_cache_entry): Don't GC unmarked font entities if some of the fonts it references are marked. This plugs a memory leak. (Bug#21556)