# HG changeset patch # User Ben Wing # Date 1269839463 18000 # Node ID be6e5ea38dda00188cfefa924ce5956a5e4815ca # Parent 8cd17b2131a13eeacdcf01c0ab1d0d86345e6111# Parent b50624d3ae55cc022205c16069cbb1c29fb0d5a9 merge diff -r 8cd17b2131a1 -r be6e5ea38dda lisp/ChangeLog --- a/lisp/ChangeLog Mon Mar 29 00:00:06 2010 -0500 +++ b/lisp/ChangeLog Mon Mar 29 00:11:03 2010 -0500 @@ -7,6 +7,27 @@ the ancillary Lisp overhead used with each type; shrink columns for windows in show-memory-usage to get it to fit in 79 chars. +2010-03-26 Aidan Kehoe + + * descr-text.el (describe-char-display): + Behave better on builds without database support, and for + characters where no font is available. Especially relevant on + Win32. + +2010-03-23 Aidan Kehoe + + * x-win-xfree86.el (x-win-init-xfree86): + If iso-left-tab (something ISO-specified and portable in theory; + in practice only seen with XFree86 and derived non-US layouts) + exists on the keyboard layout, make it equivalent to shift-tab, + addressing the issue FKtPp sees in + http://mid.gmane.org/1269358206.4873.1.camel@fktpp-laptop . + +2010-03-21 Aidan Kehoe + + * cl-extra.el (cl-prettyprint): + Handle (function ...) specially here, as we do (quote ...). + 2010-03-20 Ben Wing * diagnose.el (show-memory-usage): diff -r 8cd17b2131a1 -r be6e5ea38dda lisp/cl-extra.el --- a/lisp/cl-extra.el Mon Mar 29 00:00:06 2010 -0500 +++ b/lisp/cl-extra.el Mon Mar 29 00:11:03 2010 -0500 @@ -688,15 +688,19 @@ (defun cl-prettyprint (form) "Insert a pretty-printed rendition of a Lisp FORM in current buffer." - (let ((pt (point)) last) + (let ((pt (point)) last just) (insert "\n" (prin1-to-string form) "\n") (setq last (point)) (goto-char (1+ pt)) - (while (search-forward "(quote " last t) - (delete-backward-char 7) - (insert "'") + (while (re-search-forward "(\\(?:\\(?:function\\|quote\\) \\)" last t) + (delete-region (match-beginning 0) (match-end 0)) + (if (= (length "(function ") (- (match-end 0) (match-beginning 0))) + (insert "#'") + (insert "'")) + (setq just (point)) (forward-sexp) - (delete-char 1)) + (delete-char 1) + (goto-char just)) (goto-char (1+ pt)) (cl-do-prettyprint))) diff -r 8cd17b2131a1 -r be6e5ea38dda lisp/descr-text.el --- a/lisp/descr-text.el Mon Mar 29 00:00:06 2010 -0500 +++ b/lisp/descr-text.el Mon Mar 29 00:11:03 2010 -0500 @@ -257,14 +257,6 @@ file)) ;; XEmacs additions, from here until `describe-char-unicode-data' -(defcustom describe-char-use-cache t - "Whether `describe-char' should use a DBM or Berkeley DB cache. -This speeds up navigation of `describe-char-unicodedata-file', and makes -navigation of `describe-char-unihan-file' reasonable." - :group 'mule - :type '(choice (const :tag "None" nil) - file)) - (defcustom describe-char-unihan-file nil "Location of Unihan file. This the Unihan.txt file from the Unicode Consortium, used for diagnostics. @@ -290,6 +282,14 @@ (and (featurep 'berkeley-db) 'berkeley-db)) "The DB format to use for the `describe-char' cache, or nil if no cache.") +(defcustom describe-char-use-cache (not (null unidata-database-format)) + "Whether `describe-char' should use a DBM or Berkeley DB cache. +This speeds up navigation of `describe-char-unicodedata-file', and makes +navigation of `describe-char-unihan-file' reasonable." + :group 'mule + :type '(choice (const :tag "None" nil) + file)) + (defvar describe-char-unihan-field-descriptions #s(hash-table :test equal :data ("kAccountingNumeric" @@ -967,14 +967,17 @@ (ccl (or (and (charset-property charset 'encode-as-utf-8) ccl-encode-to-ucs-2) (charset-property charset 'ccl-program))) - (ccl-vector (make-vector 8 0))) + (ccl-vector (make-vector 8 0)) + font-instance) (if (display-graphic-p (selected-frame)) (list - (font-instance-name - (face-font-instance (or (get-char-property pos 'face) - 'default) - (selected-window) - charset)) + (if (setq font-instance + (face-font-instance (or (get-char-property pos 'face) + 'default) + (selected-window) + charset)) + (font-instance-name font-instance) + "[no font available]") (cond ((and ccl (eq 'x (frame-type frame))) (setq char (split-char char)) diff -r 8cd17b2131a1 -r be6e5ea38dda lisp/x-win-xfree86.el --- a/lisp/x-win-xfree86.el Mon Mar 29 00:00:06 2010 -0500 +++ b/lisp/x-win-xfree86.el Mon Mar 29 00:11:03 2010 -0500 @@ -77,6 +77,9 @@ nil nil nil nil nil ?/ nil nil nil nil nil nil nil nil nil nil nil nil nil ?=]) + (when (x-keysym-on-keyboard-p 'iso-left-tab device) + (define-key function-key-map 'iso-left-tab [(shift tab)])) + (loop for (key sane-key) in '((f13 f1) (f14 f2) diff -r 8cd17b2131a1 -r be6e5ea38dda src/ChangeLog --- a/src/ChangeLog Mon Mar 29 00:00:06 2010 -0500 +++ b/src/ChangeLog Mon Mar 29 00:11:03 2010 -0500 @@ -320,6 +320,17 @@ lisp_object_storage_size() and malloced_storage_size() when non-MEMORY_USAGE_STATS in the previous change set. +2010-03-22 Vin Shelton + + * window.c (vars_of_window): Move HAVE_SCROLLBARS test so the code + can compile under Visual Studio 6. + +2010-03-21 Aidan Kehoe + + * alloc.c (tick_lrecord_stats): + Fix the union build after Ben's last change, don't assume that a + Lisp_Object will fit into a Bytecount. + 2010-03-20 Ben Wing * alloc.c: diff -r 8cd17b2131a1 -r be6e5ea38dda src/alloc.c --- a/src/alloc.c Mon Mar 29 00:00:06 2010 -0500 +++ b/src/alloc.c Mon Mar 29 00:11:03 2010 -0500 @@ -3810,7 +3810,7 @@ enum lrecord_alloc_status status) { int type_index = h->type; - Bytecount obj = wrap_pointer_1 (h); + Lisp_Object obj = wrap_pointer_1 (h); Bytecount sz = lisp_object_size (obj); Bytecount sz_with_overhead = lisp_object_storage_size (obj, NULL); Bytecount overhead = sz_with_overhead - sz; diff -r 8cd17b2131a1 -r be6e5ea38dda src/window.c