diff options
| author | Stefan Monnier | 2015-05-21 23:46:10 -0400 |
|---|---|---|
| committer | Stefan Monnier | 2015-05-21 23:46:10 -0400 |
| commit | ea92591983a05bd85d52a6a07dd3b7149feb46d2 (patch) | |
| tree | b22c6fde14f284e276e587198740d621aaced913 /lib-src | |
| parent | f590fc2760f8b8180a4caf77cea81840e37fe29e (diff) | |
| download | emacs-ea92591983a05bd85d52a6a07dd3b7149feb46d2.tar.gz emacs-ea92591983a05bd85d52a6a07dd3b7149feb46d2.zip | |
Change defgeneric so it doesn't completely redefine the function
* lisp/emacs-lisp/cl-generic.el (cl-generic-define): Don't throw away
previously defined methods.
(cl-generic-define-method): Let-bind purify-flag instead of using `fset'.
(cl--generic-prefill-dispatchers): Only define during compilation.
(cl-method-qualifiers): Remove redundant alias.
(help-fns-short-filename): Silence byte-compiler.
* test/automated/cl-generic-tests.el: Adjust to new defgeneric semantics.
Diffstat (limited to 'lib-src')
| -rw-r--r-- | lib-src/emacsclient.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c index 806275f5b1d..357ebc736ab 100644 --- a/lib-src/emacsclient.c +++ b/lib-src/emacsclient.c | |||
| @@ -107,13 +107,13 @@ char *w32_getenv (char *); | |||
| 107 | /* Name used to invoke this program. */ | 107 | /* Name used to invoke this program. */ |
| 108 | const char *progname; | 108 | const char *progname; |
| 109 | 109 | ||
| 110 | /* The second argument to main. */ | 110 | /* The second argument to main. */ |
| 111 | char **main_argv; | 111 | char **main_argv; |
| 112 | 112 | ||
| 113 | /* Nonzero means don't wait for a response from Emacs. --no-wait. */ | 113 | /* Nonzero means don't wait for a response from Emacs. --no-wait. */ |
| 114 | int nowait = 0; | 114 | int nowait = 0; |
| 115 | 115 | ||
| 116 | /* Nonzero means don't print messages for successful operations. --quiet. */ | 116 | /* Nonzero means don't print messages for successful operations. --quiet. */ |
| 117 | int quiet = 0; | 117 | int quiet = 0; |
| 118 | 118 | ||
| 119 | /* Nonzero means args are expressions to be evaluated. --eval. */ | 119 | /* Nonzero means args are expressions to be evaluated. --eval. */ |
| @@ -131,7 +131,7 @@ const char *alt_display = NULL; | |||
| 131 | /* The parent window ID, if we are opening a frame via XEmbed. */ | 131 | /* The parent window ID, if we are opening a frame via XEmbed. */ |
| 132 | char *parent_id = NULL; | 132 | char *parent_id = NULL; |
| 133 | 133 | ||
| 134 | /* Nonzero means open a new Emacs frame on the current terminal. */ | 134 | /* Nonzero means open a new Emacs frame on the current terminal. */ |
| 135 | int tty = 0; | 135 | int tty = 0; |
| 136 | 136 | ||
| 137 | /* If non-NULL, the name of an editor to fallback to if the server | 137 | /* If non-NULL, the name of an editor to fallback to if the server |
| @@ -148,7 +148,7 @@ const char *server_file = NULL; | |||
| 148 | int emacs_pid = 0; | 148 | int emacs_pid = 0; |
| 149 | 149 | ||
| 150 | /* If non-NULL, a string that should form a frame parameter alist to | 150 | /* If non-NULL, a string that should form a frame parameter alist to |
| 151 | be used for the new frame */ | 151 | be used for the new frame. */ |
| 152 | const char *frame_parameters = NULL; | 152 | const char *frame_parameters = NULL; |
| 153 | 153 | ||
| 154 | static _Noreturn void print_help_and_exit (void); | 154 | static _Noreturn void print_help_and_exit (void); |