Mercurial > emacs
changeset 28965:dead0196fbc8
*** empty log message ***
| author | Kenichi Handa <handa@m17n.org> |
|---|---|
| date | Wed, 17 May 2000 23:35:57 +0000 |
| parents | 7ba5753774e5 |
| children | 4005c645c1cf |
| files | lisp/ChangeLog src/ChangeLog src/fns.c |
| diffstat | 3 files changed, 11 insertions(+), 28 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Wed May 17 23:31:47 2000 +0000 +++ b/lisp/ChangeLog Wed May 17 23:35:57 2000 +0000 @@ -1,3 +1,9 @@ +2000-05-18 Kenichi Handa <handa@etl.go.jp> + + * international/mule-diag.el (describe-char-after): Call + internal-char-font, not char-font. If internal-char-font returns + nil, display "-- none --". + 2000-05-17 Eli Zaretskii <eliz@is.elta.co.il> * image.el (image-type-available-p): Don't reference image-types @@ -183,9 +189,7 @@ * international/mule-conf.el: Add more information in descriptions of character sets. - * international/mule-diag.el (syntax-description-table): New - variable. - (describe-char-after): New function. + * international/mule-diag.el (describe-char-after): New function. (describe-font-internal): Adjusted for the change of font-info. (describe-font): Likewise. (print-fontset): Rewritten for the new fontset implementation. @@ -195,7 +199,9 @@ * simple.el (what-cursor-position): If DETAIL is non-nil, call describe-char-after instead of displaying the detail in the echo area. - + (syntax-code-table): Format changed. + (string-to-syntax): Adjusted for the above change. + 2000-05-12 Stefan Monnier <monnier@cs.yale.edu> * font-lock.el (lisp-font-lock-keywords-1): Add define-minor-mode.
--- a/src/fns.c Wed May 17 23:31:47 2000 +0000 +++ b/src/fns.c Wed May 17 23:35:57 2000 +0000 @@ -4730,29 +4730,7 @@ return Fput (name, Qhash_table_test, list2 (test, hash)); } - -#include <sys/times.h> -#include <limits.h> - -DEFUN ("cpu-ticks", Fcpy_ticks, Scpu_ticks, 0, 0, 0, - "Return time-accounting information.\n\ -Value is a list (UTIME STIME CUTIME CSTIME), where\n\ -UTIME is the CPU time used by the current process in the user space,\n\ -STIME is the CPU time used by the current process in the system kernel space\n\ -CUTIME is the CPU time used by the current and its children processs\n\ - in the user space,\n\ -CSTIME is the CPU time used by the current and its children processs\n\ - in the system kernel space.") - () -{ - struct tms buf; - - times (&buf); - return list4 (make_number (buf.tms_utime), - make_number (buf.tms_stime), - make_number (buf.tms_cutime), - make_number (buf.tms_cstime)); -} + void @@ -4897,7 +4875,6 @@ defsubr (&Sbase64_decode_region); defsubr (&Sbase64_encode_string); defsubr (&Sbase64_decode_string); - defsubr (&Scpu_ticks); }