Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
208cfda3
Commit
208cfda3
authored
Aug 15, 2015
by
Glenn Morris
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* admin/admin.el (set-version, set-copyright): Remove deleted files.
; * src/emacs,c, lib-src/ntlib.c: Comment updates.
parent
2ff8791d
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
2 additions
and
15 deletions
+2
-15
admin/admin.el
admin/admin.el
+0
-13
lib-src/ntlib.c
lib-src/ntlib.c
+1
-1
src/emacs.c
src/emacs.c
+1
-1
No files found.
admin/admin.el
View file @
208cfda3
...
...
@@ -88,21 +88,12 @@ Root must be the root of an Emacs source tree."
(
rx
(
and
"AC_INIT"
(
1+
(
not
(
in
?,
)))
?,
(
0+
space
)
(
submatch
(
1+
(
in
"0-9."
))))))
;; No longer used, broken in multiple ways, updating version seems pointless.
(
set-version-in-file
root
"nt/config.nt"
version
(
rx
(
and
bol
"#"
(
0+
blank
)
"define"
(
1+
blank
)
"VERSION"
(
1+
blank
)
"\""
(
submatch
(
1+
(
in
"0-9."
))))))
;; TODO: msdos could easily extract the version number from
;; configure.ac with sed, rather than duplicating the information.
(
set-version-in-file
root
"msdos/sed2v2.inp"
version
(
rx
(
and
bol
"/^#undef "
(
1+
not-newline
)
"define VERSION"
(
1+
space
)
"\""
(
submatch
(
1+
(
in
"0-9."
))))))
;; No longer used, broken in multiple ways, updating version seems pointless.
(
set-version-in-file
root
"nt/makefile.w32-in"
version
(
rx
(
and
"VERSION"
(
0+
space
)
"="
(
0+
space
)
(
submatch
(
1+
(
in
"0-9."
))))))
;; Major version only.
(
when
(
string-match
"\\([0-9]\\{2,\\}\\)"
version
)
(
setq
version
(
match-string
1
version
))
...
...
@@ -134,10 +125,6 @@ Root must be the root of an Emacs source tree."
(rx (and bol "
/^#undef
" (1+ not-newline)
"
define
COPYRIGHT
" (1+ space)
?\" (submatch (1+ (not (in ?\")))) ?\")))
(set-version-in-file root "
nt/config.nt
" copyright
(rx (and bol "
#" (0+ blank) "
define
" (1+ blank)
"
COPYRIGHT
" (1+ blank)
?\" (submatch (1+ (not (in ?\")))) ?\")))
(set-version-in-file root "
lib-src/rcs2log
" copyright
(rx (and "
Copyright
" (0+ space) ?= (0+ space)
?\' (submatch (1+ nonl)))))
...
...
lib-src/ntlib.c
View file @
208cfda3
...
...
@@ -302,7 +302,7 @@ is_exec (const char * name)
stricmp
(
p
,
".cmd"
)
==
0
));
}
/* FIXME? This is in config
.nt
now - is this still needed? */
/* FIXME? This is in config
ure.ac
now - is this still needed? */
#define IS_DIRECTORY_SEP(x) ((x) == '/' || (x) == '\\')
/* We need this because nt/inc/sys/stat.h defines struct stat that is
...
...
src/emacs.c
View file @
208cfda3
...
...
@@ -2429,7 +2429,7 @@ Special values:
Anything else (in Emacs 24.1, the possibilities are: aix, berkeley-unix,
hpux, irix, usg-unix-v) indicates some sort of Unix system. */
);
Vsystem_type
=
intern_c_string
(
SYSTEM_TYPE
);
/* See configure.ac
(and config.nt)
for the possible SYSTEM_TYPEs. */
/* See configure.ac for the possible SYSTEM_TYPEs. */
DEFVAR_LISP
(
"system-configuration"
,
Vsystem_configuration
,
doc:
/* Value is string indicating configuration Emacs was built for. */
);
...
...
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