diff options
| author | Miles Bader <miles@gnu.org> | 2006-10-30 08:54:41 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2006-10-30 08:54:41 +0000 |
| commit | 503be82149af57edcba384554e0f268b9a9551e1 (patch) | |
| tree | d4a7bbe12b22462bbf427fffeb889ebcf5da6782 /etc | |
| parent | 4b89b5e297a9fc832d51f47f02c264308dd6da13 (diff) | |
| parent | ab785936c82ac81edb8b20ac27c0558bc04797e5 (diff) | |
| download | emacs-503be82149af57edcba384554e0f268b9a9551e1.tar.gz | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 476-489)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 153-160)
- Merge from emacs--devo--0
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-127
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/ChangeLog | 5 | ||||
| -rw-r--r-- | etc/NEWS | 4 | ||||
| -rw-r--r-- | etc/emacs.py | 7 |
3 files changed, 14 insertions, 2 deletions
diff --git a/etc/ChangeLog b/etc/ChangeLog index 5f14cbd728f..3a04176992e 100644 --- a/etc/ChangeLog +++ b/etc/ChangeLog @@ -1,3 +1,8 @@ +2006-10-22 Chong Yidong <cyd@stupidchicken.com> + + * emacs.py (eargs): Return expected _emacs_out string even if + errors occur. + 2006-10-09 David Kastrup <dak@gnu.org> * DEVEL.HUMOR: Add the topic line for last entry since that was @@ -3368,6 +3368,10 @@ the calendar left or right. (The old key bindings still work too.) convert Emacs diary entries to/from the iCalendar format. +++ +*** The new package cal-html.el writes HTML files with calendar and +diary entries. + ++++ *** Diary sexp entries can have custom marking in the calendar. Diary sexp functions which only apply to certain days (such as `diary-block' or `diary-cyclic') now take an optional parameter MARK, diff --git a/etc/emacs.py b/etc/emacs.py index 7614f0927df..57128e2e184 100644 --- a/etc/emacs.py +++ b/etc/emacs.py @@ -59,13 +59,16 @@ def eargs (name, imports): return if inspect.ismethod (func): func = func.im_func - if not inspect.isfunction (func): return + if not inspect.isfunction (func): + print '_emacs_out ' + return (args, varargs, varkw, defaults) = inspect.getargspec (func) # No space between name and arglist for consistency with builtins. print '_emacs_out', \ func.__name__ + inspect.formatargspec (args, varargs, varkw, defaults) - except: pass + except: + print "_emacs_out " def all_names (object): """Return (an approximation to) a list of all possible attribute |