Commit 90e8d651 authored by Alan Mackenzie's avatar Alan Mackenzie
Browse files

Merge branch 'master' of /home/acm/emacs/emacs.git/master

parents caf9e31d a12c7ea8
...@@ -78,7 +78,7 @@ LOADDEFS = $(lisp)/calendar/cal-loaddefs.el \ ...@@ -78,7 +78,7 @@ LOADDEFS = $(lisp)/calendar/cal-loaddefs.el \
$(lisp)/net/tramp-loaddefs.el $(lisp)/net/tramp-loaddefs.el
# All generated autoload files. # All generated autoload files.
loaddefs = $(shell find ${srcdir} -name '*loaddefs.el') loaddefs = $(shell find ${srcdir} -name '*loaddefs.el' ! -name '.*')
# Elisp files auto-generated. # Elisp files auto-generated.
AUTOGENEL = ${loaddefs} ${srcdir}/cus-load.el ${srcdir}/finder-inf.el \ AUTOGENEL = ${loaddefs} ${srcdir}/cus-load.el ${srcdir}/finder-inf.el \
${srcdir}/subdirs.el ${srcdir}/eshell/esh-groups.el ${srcdir}/subdirs.el ${srcdir}/eshell/esh-groups.el
...@@ -243,8 +243,8 @@ update-gnus-news: ...@@ -243,8 +243,8 @@ update-gnus-news:
FORCE: FORCE:
.PHONY: FORCE .PHONY: FORCE
tagsfiles = $(shell find ${srcdir} -name '*.el') tagsfiles = $(shell find ${srcdir} -name '*.el' \
tagsfiles := $(filter-out ${srcdir}/%loaddefs.el,${tagsfiles}) ! -name '.*' ! -name '*loaddefs.el')
tagsfiles := $(filter-out ${srcdir}/ldefs-boot.el,${tagsfiles}) tagsfiles := $(filter-out ${srcdir}/ldefs-boot.el,${tagsfiles})
tagsfiles := $(filter-out ${srcdir}/eshell/esh-groups.el,${tagsfiles}) tagsfiles := $(filter-out ${srcdir}/eshell/esh-groups.el,${tagsfiles})
...@@ -470,7 +470,7 @@ check-declare: ...@@ -470,7 +470,7 @@ check-declare:
## This finds a lot of duplicates between foo.el and obsolete/foo.el. ## This finds a lot of duplicates between foo.el and obsolete/foo.el.
check-defun-dups: check-defun-dups:
sed -n -e '/^(defun /s/\(.\)(.*/\1/p' \ 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 grep -Ev '(loaddefs|ldefs-boot)\.el|obsolete') | sort | uniq -d
# Dependencies # Dependencies
......
...@@ -1870,7 +1870,7 @@ with a brace block." ...@@ -1870,7 +1870,7 @@ with a brace block."
(c-backward-token-2) (c-backward-token-2)
(c-backward-syntactic-ws)) (c-backward-syntactic-ws))
(setq name-end (point)) (setq name-end (point))
(c-backward-token-2) (c-back-over-compound-identifier)
(buffer-substring-no-properties (point) name-end))))))))) (buffer-substring-no-properties (point) name-end)))))))))
(defun c-declaration-limits (near) (defun c-declaration-limits (near)
......
...@@ -53,9 +53,6 @@ EMACSOPT = -batch --no-site-file --no-site-lisp -L "$(SEPCHAR)$(srcdir)" $(EMACS ...@@ -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. # Prevent any settings in the user environment causing problems.
unexport EMACSDATA EMACSDOC EMACSPATH GREP_OPTIONS 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". ## To run tests under a debugger, set this to eg: "gdb --args".
GDB = GDB =
...@@ -125,7 +122,7 @@ endif ...@@ -125,7 +122,7 @@ endif
echo Testing $$loadfile; \ echo Testing $$loadfile; \
stat=OK ; \ stat=OK ; \
${MKDIR_P} $(dir $@) ; \ ${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} --eval "(ert-run-tests-batch-and-exit ${SELECTOR_ACTUAL})" ${WRITE_LOG}
ifeq (@HAVE_MODULES@, yes) ifeq (@HAVE_MODULES@, yes)
...@@ -138,7 +135,7 @@ ELFILES := $(shell find ${srcdir} -path "${srcdir}/manual" -prune -o \ ...@@ -138,7 +135,7 @@ ELFILES := $(shell find ${srcdir} -path "${srcdir}/manual" -prune -o \
-path "${srcdir}/data" -prune -o \ -path "${srcdir}/data" -prune -o \
-name "*resources" -prune -o \ -name "*resources" -prune -o \
${maybe_exclude_module_tests} \ ${maybe_exclude_module_tests} \
-name "*.el" -print) -name "*.el" ! -name ".*" -print)
## .log files may be in a different directory for out of source builds ## .log files may be in a different directory for out of source builds
LOGFILES := $(patsubst %.el,%.log, \ LOGFILES := $(patsubst %.el,%.log, \
$(patsubst $(srcdir)/%,%,$(ELFILES))) $(patsubst $(srcdir)/%,%,$(ELFILES)))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment