Commit 813086ea authored by Kenichi Handa's avatar Kenichi Handa
Browse files

*** empty log message ***

parent c151654a
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> 2000-05-17 Eli Zaretskii <eliz@is.elta.co.il>
* image.el (image-type-available-p): Don't reference image-types * image.el (image-type-available-p): Don't reference image-types
...@@ -183,9 +189,7 @@ ...@@ -183,9 +189,7 @@
* international/mule-conf.el: Add more information in descriptions * international/mule-conf.el: Add more information in descriptions
of character sets. of character sets.
* international/mule-diag.el (syntax-description-table): New * international/mule-diag.el (describe-char-after): New function.
variable.
(describe-char-after): New function.
(describe-font-internal): Adjusted for the change of font-info. (describe-font-internal): Adjusted for the change of font-info.
(describe-font): Likewise. (describe-font): Likewise.
(print-fontset): Rewritten for the new fontset implementation. (print-fontset): Rewritten for the new fontset implementation.
...@@ -195,7 +199,9 @@ ...@@ -195,7 +199,9 @@
* simple.el (what-cursor-position): If DETAIL is non-nil, call * simple.el (what-cursor-position): If DETAIL is non-nil, call
describe-char-after instead of displaying the detail in the echo describe-char-after instead of displaying the detail in the echo
area. area.
(syntax-code-table): Format changed.
(string-to-syntax): Adjusted for the above change.
2000-05-12 Stefan Monnier <monnier@cs.yale.edu> 2000-05-12 Stefan Monnier <monnier@cs.yale.edu>
* font-lock.el (lisp-font-lock-keywords-1): Add define-minor-mode. * font-lock.el (lisp-font-lock-keywords-1): Add define-minor-mode.
......
No preview for this file type
...@@ -4730,29 +4730,7 @@ integers, including negative integers.") ...@@ -4730,29 +4730,7 @@ integers, including negative integers.")
return Fput (name, Qhash_table_test, list2 (test, hash)); 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 void
...@@ -4897,7 +4875,6 @@ invoked by mouse clicks and mouse menu items."); ...@@ -4897,7 +4875,6 @@ invoked by mouse clicks and mouse menu items.");
defsubr (&Sbase64_decode_region); defsubr (&Sbase64_decode_region);
defsubr (&Sbase64_encode_string); defsubr (&Sbase64_encode_string);
defsubr (&Sbase64_decode_string); defsubr (&Sbase64_decode_string);
defsubr (&Scpu_ticks);
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment