Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
90e8d651
Commit
90e8d651
authored
May 30, 2017
by
Alan Mackenzie
Browse files
Merge branch 'master' of /home/acm/emacs/emacs.git/master
parents
caf9e31d
a12c7ea8
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
10 deletions
+7
-10
lisp/Makefile.in
lisp/Makefile.in
+4
-4
lisp/progmodes/cc-cmds.el
lisp/progmodes/cc-cmds.el
+1
-1
test/Makefile.in
test/Makefile.in
+2
-5
No files found.
lisp/Makefile.in
View file @
90e8d651
...
...
@@ -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
...
...
lisp/progmodes/cc-cmds.el
View file @
90e8d651
...
...
@@ -1870,7 +1870,7 @@ with a brace block."
(
c-backward-token-2
)
(
c-backward-syntactic-ws
))
(
setq
name-end
(
point
))
(
c-back
ward-token-2
)
(
c-back
-over-compound-identifier
)
(
buffer-substring-no-properties
(
point
)
name-end
)))))))))
(
defun
c-declaration-limits
(
near
)
...
...
test/Makefile.in
View file @
90e8d651
...
...
@@ -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.
un
export
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)
))
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment