diff options
| author | Alan Mackenzie <acm@muc.de> | 2017-05-30 17:39:40 +0000 |
|---|---|---|
| committer | Alan Mackenzie <acm@muc.de> | 2017-05-30 17:39:40 +0000 |
| commit | 90e8d65118e1059ea6552c9e5eb59128af390200 (patch) | |
| tree | c17a230e718000468384604555d4132c42e236cb | |
| parent | caf9e31d714dc817118e2549557fdda3d28a4c2b (diff) | |
| parent | a12c7ea88eb218550654fdb511d9be114742d692 (diff) | |
| download | emacs-90e8d65118e1059ea6552c9e5eb59128af390200.tar.gz | |
Merge branch 'master' of /home/acm/emacs/emacs.git/master
| -rw-r--r-- | lisp/Makefile.in | 8 | ||||
| -rw-r--r-- | lisp/progmodes/cc-cmds.el | 2 | ||||
| -rw-r--r-- | test/Makefile.in | 7 |
3 files changed, 7 insertions, 10 deletions
diff --git a/lisp/Makefile.in b/lisp/Makefile.in index ba4925fb792..653200577db 100644 --- a/lisp/Makefile.in +++ b/lisp/Makefile.in @@ -78,7 +78,7 @@ LOADDEFS = $(lisp)/calendar/cal-loaddefs.el \ $(lisp)/net/tramp-loaddefs.el # All generated autoload files. -loaddefs = $(shell find ${srcdir} -name '*loaddefs.el') +loaddefs = $(shell find ${srcdir} -name '*loaddefs.el' ! -name '.*') # Elisp files auto-generated. AUTOGENEL = ${loaddefs} ${srcdir}/cus-load.el ${srcdir}/finder-inf.el \ ${srcdir}/subdirs.el ${srcdir}/eshell/esh-groups.el @@ -243,8 +243,8 @@ update-gnus-news: FORCE: .PHONY: FORCE -tagsfiles = $(shell find ${srcdir} -name '*.el') -tagsfiles := $(filter-out ${srcdir}/%loaddefs.el,${tagsfiles}) +tagsfiles = $(shell find ${srcdir} -name '*.el' \ + ! -name '.*' ! -name '*loaddefs.el') tagsfiles := $(filter-out ${srcdir}/ldefs-boot.el,${tagsfiles}) tagsfiles := $(filter-out ${srcdir}/eshell/esh-groups.el,${tagsfiles}) @@ -470,7 +470,7 @@ check-declare: ## This finds a lot of duplicates between foo.el and obsolete/foo.el. check-defun-dups: sed -n -e '/^(defun /s/\(.\)(.*/\1/p' \ - $$(find . -name '*.el' -print | \ + $$(find . -name '*.el' ! -name '.*' -print | \ grep -Ev '(loaddefs|ldefs-boot)\.el|obsolete') | sort | uniq -d # Dependencies diff --git a/lisp/progmodes/cc-cmds.el b/lisp/progmodes/cc-cmds.el index a5ddcb4b92d..9c0798e7529 100644 --- a/lisp/progmodes/cc-cmds.el +++ b/lisp/progmodes/cc-cmds.el @@ -1870,7 +1870,7 @@ with a brace block." (c-backward-token-2) (c-backward-syntactic-ws)) (setq name-end (point)) - (c-backward-token-2) + (c-back-over-compound-identifier) (buffer-substring-no-properties (point) name-end))))))))) (defun c-declaration-limits (near) diff --git a/test/Makefile.in b/test/Makefile.in index c9065d90d1b..d13288b895c 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -53,9 +53,6 @@ EMACSOPT = -batch --no-site-file --no-site-lisp -L "$(SEPCHAR)$(srcdir)" $(EMACS # Prevent any settings in the user environment causing problems. unexport EMACSDATA EMACSDOC EMACSPATH GREP_OPTIONS -# Prevent tests using or changing anything in HOME. -export HOME = /nonexistent - ## To run tests under a debugger, set this to eg: "gdb --args". GDB = @@ -125,7 +122,7 @@ endif echo Testing $$loadfile; \ stat=OK ; \ ${MKDIR_P} $(dir $@) ; \ - $(emacs) -l ert -l $$loadfile \ + HOME=/nonexistent $(emacs) -l ert -l $$loadfile \ --eval "(ert-run-tests-batch-and-exit ${SELECTOR_ACTUAL})" ${WRITE_LOG} ifeq (@HAVE_MODULES@, yes) @@ -138,7 +135,7 @@ ELFILES := $(shell find ${srcdir} -path "${srcdir}/manual" -prune -o \ -path "${srcdir}/data" -prune -o \ -name "*resources" -prune -o \ ${maybe_exclude_module_tests} \ - -name "*.el" -print) + -name "*.el" ! -name ".*" -print) ## .log files may be in a different directory for out of source builds LOGFILES := $(patsubst %.el,%.log, \ $(patsubst $(srcdir)/%,%,$(ELFILES))) |