mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-10 05:30:45 -08:00
Code Issues Projects Releases Wiki Activity

*** empty log message ***

Browse source
This commit is contained in:
Kenichi Handa 2000-05-17 23:35:57 +00:00
parent c151654a5a
commit 813086ea08
3 changed files with 28 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

14
lisp/ChangeLog
View file

@ -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.

18
src/ChangeLog
View file

@ -1,3 +1,21 @@
2000-05-18 Kenichi Handa <handa@etl.go.jp>
* fns.c (map_char_table): Pay attention to character number of
charset. Check the validity of charset at the first level. For
leaf nodes that has nil value, call C_FUNCTION or FUNCTION with
the default value.
* fontset.c: Include "buffer.h".
(fs_load_font): If the face has fontset, record the face ID in
that fontset.
(Finternal_char_font): New function.
(accumulate_font_info): New function.
(Ffontset_info): Rewritten for the new fontset implementation.
(syms_of_fontset): Register Vdefault_fontset in the first element
of Vfontset_table. Include Vdefault_fontset in
Vfontset_alias_alist. Declare `internal-char-font' as a Lisp
function.
2000-05-16 Dave Love <fx@gnu.org>
* m/iris5d.h: Deleted -- unused.

23
src/fns.c
View file

@ -4730,29 +4730,7 @@ integers, including negative integers.")
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 @@ invoked by mouse clicks and mouse menu items.");
defsubr (&Sbase64_decode_region);
defsubr (&Sbase64_encode_string);
defsubr (&Sbase64_decode_string);
defsubr (&Scpu_ticks);
}