summaryrefslogtreecommitdiff
path: root/lisp/progmodes/grep.el
diff options
context:
space:
mode:
authorJohn Wiegley <johnw@newartisans.com>2016-02-15 14:11:03 -0800
committerJohn Wiegley <johnw@newartisans.com>2016-02-15 14:11:03 -0800
commit220613e089ec012ae4ab319637365132ce8dc306 (patch)
tree715595598dfd3d80ba7c4306a0ea8f010b320db4 /lisp/progmodes/grep.el
parentca03b85b9c1b8908f2651eaf594780c7b5217f61 (diff)
parentd4b93e11a519cf71beca69654fda158d01a26c3b (diff)
downloademacs-220613e089ec012ae4ab319637365132ce8dc306.tar.gz
Merge from origin/emacs-25
d4b93e1 Minor fixes in global-auto-composition-mode 02b037b Allow arithmetic operators inside C++ template constructs. 44b16f6 Avoid crashes in semi-malformed 'condition-case' 652e5b4 Allow arithmetic operators inside C++ template constructs. d9ea795 Fix regression with 'recent-keys' and keyboard macros 903603f Fix wording in a doc-view.el comment cf79616 ; Spelling fixes f8bf1b3 CONTRIBUTE cleanups and updates f3aaca3 Port USE_STACK_LISP_OBJECTS fix to Clang 1834ac7 Port to x86 GCC 4.3.1 and earlier 8482949 Fix point movement under 'scroll-conservatively' c1313b5 Replace colon in file name (not legal on Windows) f7af26c Fix a typo in edt.texi 8badf95 Make 'mmap_realloc' on MS-Windows more reliable 856cd94 Grep alias `all' shall not match parent directory
Diffstat (limited to 'lisp/progmodes/grep.el')
-rw-r--r--lisp/progmodes/grep.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el
index 7e6f157f5fe..f04a7226d18 100644
--- a/lisp/progmodes/grep.el
+++ b/lisp/progmodes/grep.el
@@ -189,7 +189,7 @@ Customize or call the function `grep-apply-setting'."
:group 'grep)
(defcustom grep-files-aliases
- '(("all" . "* .*")
+ '(("all" . "* .[!.]* ..?*") ;; Don't match `..'. See bug#22577
("el" . "*.el")
("ch" . "*.[ch]")
("c" . "*.c")