diff options
| author | Eli Zaretskii | 2015-01-04 17:51:35 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2015-01-04 17:51:35 +0200 |
| commit | 143516c73db7e182687f4be98966461ce7f3703f (patch) | |
| tree | 138e8b325c732980265a6ccd6b476b4a15f3f5a7 /src | |
| parent | d7af65d24ade808b44d4c936bf4b6e2eaab708cc (diff) | |
| download | emacs-143516c73db7e182687f4be98966461ce7f3703f.tar.gz emacs-143516c73db7e182687f4be98966461ce7f3703f.zip | |
src/emacs.c (syms_of_emacs) <system-configuration>: Doc fix. (Bug#19502)
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/emacs.c | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 7e6a7c4c9e7..39acf77e41b 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2015-01-04 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * emacs.c (syms_of_emacs) <system-configuration>: Doc fix. | ||
| 4 | (Bug#19502) | ||
| 5 | |||
| 1 | 2014-12-30 Eli Zaretskii <eliz@gnu.org> | 6 | 2014-12-30 Eli Zaretskii <eliz@gnu.org> |
| 2 | 7 | ||
| 3 | * xdisp.c (pos_visible_p): Fix up the X coordinate for | 8 | * xdisp.c (pos_visible_p): Fix up the X coordinate for |
diff --git a/src/emacs.c b/src/emacs.c index 33e8e9df7ba..d89a6810832 100644 --- a/src/emacs.c +++ b/src/emacs.c | |||
| @@ -2439,9 +2439,7 @@ hpux, irix, usg-unix-v) indicates some sort of Unix system. */); | |||
| 2439 | /* See configure.ac (and config.nt) for the possible SYSTEM_TYPEs. */ | 2439 | /* See configure.ac (and config.nt) for the possible SYSTEM_TYPEs. */ |
| 2440 | 2440 | ||
| 2441 | DEFVAR_LISP ("system-configuration", Vsystem_configuration, | 2441 | DEFVAR_LISP ("system-configuration", Vsystem_configuration, |
| 2442 | doc: /* Value is string indicating configuration Emacs was built for. | 2442 | doc: /* Value is string indicating configuration Emacs was built for. */); |
| 2443 | On MS-Windows, the value reflects the OS flavor and version on which | ||
| 2444 | Emacs is running. */); | ||
| 2445 | Vsystem_configuration = build_string (EMACS_CONFIGURATION); | 2443 | Vsystem_configuration = build_string (EMACS_CONFIGURATION); |
| 2446 | 2444 | ||
| 2447 | DEFVAR_LISP ("system-configuration-options", Vsystem_configuration_options, | 2445 | DEFVAR_LISP ("system-configuration-options", Vsystem_configuration_options, |