diff options
| author | K. Handa | 2015-09-27 17:06:12 +0900 |
|---|---|---|
| committer | K. Handa | 2015-09-27 17:06:12 +0900 |
| commit | 52beda922d2cb523a03661bf74b8678c8b45e440 (patch) | |
| tree | 04617b37298746a61d5324a5b35c9b71f439d762 /src/data.c | |
| parent | 94ed5167557112fb00eeca05e62589db744206de (diff) | |
| parent | 1ac5a9c20cb22efb398fa18781c6b932dd4e54df (diff) | |
| download | emacs-52beda922d2cb523a03661bf74b8678c8b45e440.tar.gz emacs-52beda922d2cb523a03661bf74b8678c8b45e440.zip | |
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
Diffstat (limited to 'src/data.c')
| -rw-r--r-- | src/data.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/data.c b/src/data.c index 88c5a309859..eda611055d8 100644 --- a/src/data.c +++ b/src/data.c | |||
| @@ -226,8 +226,9 @@ for example, (type-of 1) returns `integer'. */) | |||
| 226 | return Qfloat; | 226 | return Qfloat; |
| 227 | case Lisp_Misc_Finalizer: | 227 | case Lisp_Misc_Finalizer: |
| 228 | return Qfinalizer; | 228 | return Qfinalizer; |
| 229 | default: | ||
| 230 | emacs_abort (); | ||
| 229 | } | 231 | } |
| 230 | emacs_abort (); | ||
| 231 | 232 | ||
| 232 | case Lisp_Vectorlike: | 233 | case Lisp_Vectorlike: |
| 233 | if (WINDOW_CONFIGURATIONP (object)) | 234 | if (WINDOW_CONFIGURATIONP (object)) |
| @@ -790,7 +791,7 @@ SUBR must be a built-in function. */) | |||
| 790 | DEFUN ("interactive-form", Finteractive_form, Sinteractive_form, 1, 1, 0, | 791 | DEFUN ("interactive-form", Finteractive_form, Sinteractive_form, 1, 1, 0, |
| 791 | doc: /* Return the interactive form of CMD or nil if none. | 792 | doc: /* Return the interactive form of CMD or nil if none. |
| 792 | If CMD is not a command, the return value is nil. | 793 | If CMD is not a command, the return value is nil. |
| 793 | Value, if non-nil, is a list \(interactive SPEC). */) | 794 | Value, if non-nil, is a list (interactive SPEC). */) |
| 794 | (Lisp_Object cmd) | 795 | (Lisp_Object cmd) |
| 795 | { | 796 | { |
| 796 | Lisp_Object fun = indirect_function (cmd); /* Check cycles. */ | 797 | Lisp_Object fun = indirect_function (cmd); /* Check cycles. */ |
| @@ -1659,8 +1660,8 @@ DEFUN ("make-local-variable", Fmake_local_variable, Smake_local_variable, | |||
| 1659 | 1, 1, "vMake Local Variable: ", | 1660 | 1, 1, "vMake Local Variable: ", |
| 1660 | doc: /* Make VARIABLE have a separate value in the current buffer. | 1661 | doc: /* Make VARIABLE have a separate value in the current buffer. |
| 1661 | Other buffers will continue to share a common default value. | 1662 | Other buffers will continue to share a common default value. |
| 1662 | \(The buffer-local value of VARIABLE starts out as the same value | 1663 | (The buffer-local value of VARIABLE starts out as the same value |
| 1663 | VARIABLE previously had. If VARIABLE was void, it remains void.\) | 1664 | VARIABLE previously had. If VARIABLE was void, it remains void.) |
| 1664 | Return VARIABLE. | 1665 | Return VARIABLE. |
| 1665 | 1666 | ||
| 1666 | If the variable is already arranged to become local when set, | 1667 | If the variable is already arranged to become local when set, |