Using saved parent location: http://bzr.savannah.gnu.org/r/emacs/trunk/ Now on revision 99474. ------------------------------------------------------------ revno: 99474 committer: Glenn Morris branch nick: trunk timestamp: Mon 2010-02-08 21:43:23 -0800 message: * ChangeLog: Mark tiny change. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2010-02-08 23:39:01 +0000 +++ src/ChangeLog 2010-02-09 05:43:23 +0000 @@ -1,4 +1,4 @@ -2010-02-08 Francis Devereux +2010-02-08 Francis Devereux (tiny change) * nsfont.m (nsfont_open): The system's value for the font descent is negative, so round it down to avoid clipping. ------------------------------------------------------------ revno: 99473 committer: Chong Yidong branch nick: trunk timestamp: Mon 2010-02-08 20:58:57 -0500 message: * eshell/em-ls.el (eshell-ls-applicable): Frob file attributes correctly (Bug#5548). diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-02-08 23:27:29 +0000 +++ lisp/ChangeLog 2010-02-09 01:58:57 +0000 @@ -1,3 +1,8 @@ +2010-02-09 Chong Yidong + + * eshell/em-ls.el (eshell-ls-applicable): Frob file attributes + correctly (Bug#5548). + 2010-02-08 Jose E. Marchesi * progmodes/ada-mode.el (ada-in-numeric-literal-p): New function. === modified file 'lisp/eshell/em-ls.el' --- lisp/eshell/em-ls.el 2010-02-07 06:23:10 +0000 +++ lisp/eshell/em-ls.el 2010-02-09 01:58:57 +0000 @@ -225,18 +225,28 @@ (eq (aref (nth 8 attrs) 0) type))) (defmacro eshell-ls-applicable (attrs index func file) - "Test whether, for ATTRS, the user UID can do what corresponds to INDEX. -This is really just for efficiency, to avoid having to stat the file -yet again." - `(if (numberp (nth 2 ,attrs)) - (if (= (user-uid) (nth 2 ,attrs)) - (not (eq (aref (nth 8 ,attrs) ,index) ?-)) - (,(eval func) ,file)) - (not (eq (aref (nth 8 ,attrs) - (+ ,index (if (member (nth 2 ,attrs) - (eshell-current-ange-uids)) - 0 6))) - ?-)))) + "Test whether, for ATTRS, the user can do what corresponds to INDEX. +ATTRS is a string of file modes. See `file-attributes'. +If we cannot determine the answer using ATTRS (e.g., if we need +to know what group the user is in), compute the return value by +calling FUNC with FILE as an argument." + `(let ((owner (nth 2 ,attrs)) + (modes (nth 8 ,attrs))) + (cond ((cond ((numberp owner) + (= owner (user-uid))) + ((stringp owner) + (or (string-equal owner (user-login-name)) + (member owner (eshell-current-ange-uids))))) + ;; The user owns this file. + (not (eq (aref modes ,index) ?-))) + ((eq (aref modes (+ ,index 3)) + (aref modes (+ ,index 6))) + ;; If the "group" and "other" fields give identical + ;; results, use that. + (not (eq (aref modes (+ ,index 3)) ?-))) + (t + ;; Otherwise call FUNC. + (,(eval func) ,file))))) (defcustom eshell-ls-highlight-alist nil "*This alist correlates test functions to color. ------------------------------------------------------------ revno: 99472 committer: Chong Yidong branch nick: trunk timestamp: Mon 2010-02-08 18:39:01 -0500 message: * nsfont.m (nsfont_open): The system's value for the font descent is negative, so round it down to avoid clipping. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2010-02-06 13:29:05 +0000 +++ src/ChangeLog 2010-02-08 23:39:01 +0000 @@ -1,3 +1,8 @@ +2010-02-08 Francis Devereux + + * nsfont.m (nsfont_open): The system's value for the font descent + is negative, so round it down to avoid clipping. + 2010-02-06 Chong Yidong * charset.c (load_charset_map_from_file) === modified file 'src/nsfont.m' --- src/nsfont.m 2010-01-13 08:35:10 +0000 +++ src/nsfont.m 2010-02-08 23:39:01 +0000 @@ -844,8 +844,10 @@ /* max bounds */ font_info->max_bounds.ascent = lrint (hshrink * [sfont ascender] + expand * hd/2); + /* [sfont descender] is usually negative. Use floor to avoid + clipping descenders. */ font_info->max_bounds.descent = - -lrint (hshrink* [sfont descender] - expand*hd/2); + -lrint (floor(hshrink* [sfont descender] - expand*hd/2)); font_info->height = font_info->max_bounds.ascent + font_info->max_bounds.descent; font_info->max_bounds.width = lrint (font_info->width); @@ -880,8 +882,8 @@ #endif /* set up metrics portion of font struct */ - font->ascent = [sfont ascender]; - font->descent = -[sfont descender]; + font->ascent = lrint([sfont ascender]); + font->descent = -lrint(floor([sfont descender])); font->min_width = ns_char_width(sfont, '|'); font->space_width = lrint (ns_char_width (sfont, ' ')); font->average_width = lrint (font_info->width); ------------------------------------------------------------ revno: 99471 committer: Chong Yidong branch nick: trunk timestamp: Mon 2010-02-08 18:27:29 -0500 message: Fix ada-mode handling of number literals. * progmodes/ada-mode.el (ada-in-numeric-literal-p): New function. (ada-adjust-case): Don't adjust case in hexadecimal number literals. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-02-08 07:08:18 +0000 +++ lisp/ChangeLog 2010-02-08 23:27:29 +0000 @@ -1,3 +1,9 @@ +2010-02-08 Jose E. Marchesi + + * progmodes/ada-mode.el (ada-in-numeric-literal-p): New function. + (ada-adjust-case): Don't adjust case in hexadecimal number + literals. + 2010-02-08 Kenichi Handa * international/mule-util.el (with-coding-priority): Add autoload === modified file 'lisp/progmodes/ada-mode.el' --- lisp/progmodes/ada-mode.el 2010-01-23 12:34:52 +0000 +++ lisp/progmodes/ada-mode.el 2010-02-08 23:27:29 +0000 @@ -1017,6 +1017,9 @@ (line-beginning-position) (point)))) (or (ada-in-string-p parse-result) (ada-in-comment-p parse-result))) +(defsubst ada-in-numeric-literal-p () + "Return t if point is after a prefix of a numeric literal." + (looking-back "\\([0-9]+#[0-9a-fA-F_]+\\)")) ;;------------------------------------------------------------------ ;; Contextual menus @@ -1606,6 +1609,8 @@ (eq (char-syntax (char-before)) ?w) ;; if in a string or a comment (not (ada-in-string-or-comment-p)) + ;; if in a numeric literal + (not (ada-in-numeric-literal-p)) ) (if (save-excursion (forward-word -1) ------------------------------------------------------------ revno: 99470 committer: Glenn Morris branch nick: trunk timestamp: Mon 2010-02-08 09:11:15 -0800 message: * buffers.texi: Fix typo in previous. diff: === modified file 'doc/emacs/buffers.texi' --- doc/emacs/buffers.texi 2010-02-08 07:20:58 +0000 +++ doc/emacs/buffers.texi 2010-02-08 17:11:15 +0000 @@ -584,7 +584,7 @@ @vindex uniquify-buffer-name-style Other methods work by adding parts of each file's directory to the buffer name. To select one, load the library @file{uniquify} (e.g. -using @code{(require 'uniquify)}, and customize the variable +using @code{(require 'uniquify)}), and customize the variable @code{uniquify-buffer-name-style} (@pxref{Easy Customization}). To begin with, the @code{forward} naming method includes part of the ------------------------------------------------------------ revno: 99469 committer: Glenn Morris branch nick: trunk timestamp: Sun 2010-02-07 23:20:58 -0800 message: Close bug#5529. * buffers.texi (Uniquify): Must explicitly load library. (Bug#5529) diff: === modified file 'doc/emacs/ChangeLog' --- doc/emacs/ChangeLog 2010-02-01 18:39:33 +0000 +++ doc/emacs/ChangeLog 2010-02-08 07:20:58 +0000 @@ -1,3 +1,7 @@ +2010-02-08 Glenn Morris + + * buffers.texi (Uniquify): Must explicitly load library. (Bug#5529) + 2010-02-01 Stefan Monnier * display.texi (Useless Whitespace, Text Display): === modified file 'doc/emacs/buffers.texi' --- doc/emacs/buffers.texi 2010-01-13 08:35:10 +0000 +++ doc/emacs/buffers.texi 2010-02-08 07:20:58 +0000 @@ -583,7 +583,8 @@ @vindex uniquify-buffer-name-style Other methods work by adding parts of each file's directory to the -buffer name. To select one, customize the variable +buffer name. To select one, load the library @file{uniquify} (e.g. +using @code{(require 'uniquify)}, and customize the variable @code{uniquify-buffer-name-style} (@pxref{Easy Customization}). To begin with, the @code{forward} naming method includes part of the