aboutsummaryrefslogtreecommitdiffstats
path: root/src/data.c
diff options
context:
space:
mode:
authorRichard Stallman2015-04-05 08:36:56 -0400
committerRichard Stallman2015-04-05 08:42:43 -0400
commit4e23cd0ccde4ad1e14fe2870ccf140487af649b2 (patch)
treeb709ac1e92a892f6ec1faa85eb59a9e5960c25dd /src/data.c
parentdca743f0941909a80e3f28c023977120b6203e20 (diff)
parent16eec6fc55dcc05d1d819f18998e84a9580b2521 (diff)
downloademacs-4e23cd0ccde4ad1e14fe2870ccf140487af649b2.tar.gz
emacs-4e23cd0ccde4ad1e14fe2870ccf140487af649b2.zip
* mail/rmail.el (rmail-show-message-1): When displaying a mime message,
indicate start and finish in the echo area. * mail/rmail.el (rmail-epa-decrypt): Disregard <pre> before armor. Ignore more kinds of whitespace in mime headers. Modify the decrypted mime part's mime type so it will be displayed by default when visiting this message again. * net/browse-url.el (browse-url-firefox-program): Prefer IceCat, doc. (browse-url-firefox-arguments) (browse-url-firefox-startup-arguments): Doc fix.
Diffstat (limited to 'src/data.c')
-rw-r--r--src/data.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/data.c b/src/data.c
index d06b9916b3a..c96841aebbf 100644
--- a/src/data.c
+++ b/src/data.c
@@ -223,7 +223,9 @@ for example, (type-of 1) returns `integer'. */)
223 case Lisp_Misc_Overlay: 223 case Lisp_Misc_Overlay:
224 return Qoverlay; 224 return Qoverlay;
225 case Lisp_Misc_Float: 225 case Lisp_Misc_Float:
226 return Qfloat; 226 return Qfloat;
227 case Lisp_Misc_Finalizer:
228 return Qfinalizer;
227 } 229 }
228 emacs_abort (); 230 emacs_abort ();
229 231
@@ -2125,8 +2127,6 @@ DEFUN ("indirect-function", Findirect_function, Sindirect_function, 1, 2, 0,
2125 doc: /* Return the function at the end of OBJECT's function chain. 2127 doc: /* Return the function at the end of OBJECT's function chain.
2126If OBJECT is not a symbol, just return it. Otherwise, follow all 2128If OBJECT is not a symbol, just return it. Otherwise, follow all
2127function indirections to find the final function binding and return it. 2129function indirections to find the final function binding and return it.
2128If the final symbol in the chain is unbound, signal a void-function error.
2129Optional arg NOERROR non-nil means to return nil instead of signaling.
2130Signal a cyclic-function-indirection error if there is a loop in the 2130Signal a cyclic-function-indirection error if there is a loop in the
2131function chain of symbols. */) 2131function chain of symbols. */)
2132 (register Lisp_Object object, Lisp_Object noerror) 2132 (register Lisp_Object object, Lisp_Object noerror)
@@ -2141,9 +2141,6 @@ function chain of symbols. */)
2141 if (!NILP (result)) 2141 if (!NILP (result))
2142 return result; 2142 return result;
2143 2143
2144 if (NILP (noerror))
2145 xsignal1 (Qvoid_function, object);
2146
2147 return Qnil; 2144 return Qnil;
2148} 2145}
2149 2146
@@ -3552,6 +3549,7 @@ syms_of_data (void)
3552 DEFSYM (Qcons, "cons"); 3549 DEFSYM (Qcons, "cons");
3553 DEFSYM (Qmarker, "marker"); 3550 DEFSYM (Qmarker, "marker");
3554 DEFSYM (Qoverlay, "overlay"); 3551 DEFSYM (Qoverlay, "overlay");
3552 DEFSYM (Qfinalizer, "finalizer");
3555 DEFSYM (Qfloat, "float"); 3553 DEFSYM (Qfloat, "float");
3556 DEFSYM (Qwindow_configuration, "window-configuration"); 3554 DEFSYM (Qwindow_configuration, "window-configuration");
3557 DEFSYM (Qprocess, "process"); 3555 DEFSYM (Qprocess, "process");