Using saved parent location: http://bzr.savannah.gnu.org/r/emacs/trunk/ Now on revision 100627. ------------------------------------------------------------ revno: 100627 committer: Jan D. branch nick: trunk timestamp: Tue 2010-06-22 08:42:00 +0200 message: * font.c (font_parse_fcname): Allow . for sizes like 7.5 (bug#6437). diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2010-06-20 18:04:30 +0000 +++ src/ChangeLog 2010-06-22 06:42:00 +0000 @@ -1,3 +1,7 @@ +2010-06-22 Keith Packard (tiny change) + + * font.c (font_parse_fcname): Allow . for sizes like 7.5 (bug#6437). + 2010-06-20 Eli Zaretskii * xdisp.c (try_scrolling): When scroll-conservatively is set to === modified file 'src/font.c' --- src/font.c 2010-05-28 06:42:43 +0000 +++ src/font.c 2010-06-22 06:42:00 +0000 @@ -1544,7 +1544,7 @@ int size_found = 1; for (q = p + 1; *q && *q != ' '; q++) - if (! isdigit (*q)) + if (! isdigit (*q) && *q != '.') { size_found = 0; break; ------------------------------------------------------------ revno: 100626 committer: Karl Fogel branch nick: trunk timestamp: Mon 2010-06-21 19:26:46 -0400 message: * lisp/simple.el (compose-mail): Fix doc string to refer to `compose-mail-user-agent-warnings', instead of to the nonexistent `compose-mail-check-user-agent'. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-06-21 21:08:26 +0000 +++ lisp/ChangeLog 2010-06-21 23:26:46 +0000 @@ -1,3 +1,9 @@ +2010-06-21 Karl Fogel + + * simple.el (compose-mail): Fix doc string to refer to + `compose-mail-user-agent-warnings', instead of to the + nonexistent `compose-mail-check-user-agent'. + 2010-06-21 Alan Mackenzie Fix an indentation bug: === modified file 'lisp/simple.el' --- lisp/simple.el 2010-06-04 18:38:11 +0000 +++ lisp/simple.el 2010-06-21 23:26:46 +0000 @@ -5698,7 +5698,7 @@ The default mail mode is now Message mode. You have the following Mail mode variable%s customized: \n %s\n\nTo use Mail mode, set `mail-user-agent' to sendmail-user-agent. -To disable this warning, set `compose-mail-check-user-agent' to nil." +To disable this warning, set `compose-mail-user-agent-warnings' to nil." (if (> (length warn-vars) 1) "s" "") (mapconcat 'symbol-name warn-vars " ")))))) ------------------------------------------------------------ revno: 100625 committer: Alan Mackenzie branch nick: trunk timestamp: Mon 2010-06-21 21:08:26 +0000 message: Fix an indentation bug: progmodes/cc-mode.el (c-common-init): Initialise c-new-BEG/END. (c-neutralize-syntax-in-and-mark-CPP): c-new-BEG/END: Take account of existing values. progmodes/cc-engine.el (c-clear-<-pair-props-if-match-after) (c-clear->-pair-props-if-match-before): now return t when they've cleared properties, nil otherwise. (c-before-change-check-<>-operators): Set c-new-beg/end correctly by taking account of the existing value. progmodes/cc-defs.el (c-clear-char-property-with-value-function): Fix this to clear the property rather than overwriting it with nil. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-06-20 04:55:14 +0000 +++ lisp/ChangeLog 2010-06-21 21:08:26 +0000 @@ -1,3 +1,21 @@ +2010-06-21 Alan Mackenzie + + Fix an indentation bug: + + * progmodes/cc-mode.el (c-common-init): Initialise c-new-BEG/END. + (c-neutralize-syntax-in-and-mark-CPP): c-new-BEG/END: Take account + of existing values. + + * progmodes/cc-engine.el (c-clear-<-pair-props-if-match-after) + (c-clear->-pair-props-if-match-before): now return t when they've + cleared properties, nil otherwise. + (c-before-change-check-<>-operators): Set c-new-beg/end correctly + by taking account of the existing value. + + * progmodes/cc-defs.el + (c-clear-char-property-with-value-function): Fix this to clear the + property rather than overwriting it with nil. + 2010-06-20 Chong Yidong * emacs-lisp/package.el (package-print-package): Add link to === modified file 'lisp/progmodes/cc-defs.el' --- lisp/progmodes/cc-defs.el 2010-04-19 15:07:52 +0000 +++ lisp/progmodes/cc-defs.el 2010-06-21 21:08:26 +0000 @@ -1082,7 +1082,7 @@ (setq place (next-single-property-change place property nil to))) (< place to)) (setq end-place (next-single-property-change place property nil to)) - (put-text-property place end-place property nil) + (remove-text-properties place end-place (cons property nil)) ;; Do we have to do anything with stickiness here? (setq place end-place)))) === modified file 'lisp/progmodes/cc-engine.el' --- lisp/progmodes/cc-engine.el 2010-05-21 19:51:48 +0000 +++ lisp/progmodes/cc-engine.el 2010-06-21 21:08:26 +0000 @@ -4985,7 +4985,8 @@ ;; POS (default point) is at a < character. If it is both marked ;; with open/close paren syntax-table property, and has a matching > ;; (also marked) which is after LIM, remove the property both from - ;; the current > and its partner. + ;; the current > and its partner. Return t when this happens, nil + ;; when it doesn't. (save-excursion (if pos (goto-char pos) @@ -4998,13 +4999,15 @@ (equal (c-get-char-property (1- (point)) 'syntax-table) c->-as-paren-syntax)) ; should always be true. (c-unmark-<->-as-paren (1- (point))) - (c-unmark-<->-as-paren pos))))) + (c-unmark-<->-as-paren pos)) + t))) (defun c-clear->-pair-props-if-match-before (lim &optional pos) ;; POS (default point) is at a > character. If it is both marked ;; with open/close paren syntax-table property, and has a matching < ;; (also marked) which is before LIM, remove the property both from - ;; the current < and its partner. + ;; the current < and its partner. Return t when this happens, nil + ;; when it doesn't. (save-excursion (if pos (goto-char pos) @@ -5017,7 +5020,8 @@ (equal (c-get-char-property (point) 'syntax-table) c-<-as-paren-syntax)) ; should always be true. (c-unmark-<->-as-paren (point)) - (c-unmark-<->-as-paren pos))))) + (c-unmark-<->-as-paren pos)) + t))) (defun c-before-change-check-<>-operators (beg end) ;; Unmark certain pairs of "< .... >" which are currently marked as @@ -5040,25 +5044,39 @@ ;; 2010-01-29. (save-excursion (let ((beg-lit-limits (progn (goto-char beg) (c-literal-limits))) - (end-lit-limits (progn (goto-char end) (c-literal-limits)))) + (end-lit-limits (progn (goto-char end) (c-literal-limits))) + new-beg new-end need-new-beg need-new-end) ;; Locate the barrier before the changed region (goto-char (if beg-lit-limits (car beg-lit-limits) beg)) (c-syntactic-skip-backward "^;{}" (max (- beg 2048) (point-min))) + (setq new-beg (point)) ;; Remove the syntax-table properties from each pertinent <...> pair. ;; Firsly, the ones with the < before beg and > after beg. (while (c-search-forward-char-property 'category 'c-<-as-paren-syntax beg) - (c-clear-<-pair-props-if-match-after beg (1- (point)))) + (if (c-clear-<-pair-props-if-match-after beg (1- (point))) + (setq need-new-beg t))) ;; Locate the barrier after END. (goto-char (if end-lit-limits (cdr end-lit-limits) end)) (c-syntactic-re-search-forward "[;{}]" (min (+ end 2048) (point-max)) 'end) + (setq new-end (point)) ;; Remove syntax-table properties from the remaining pertinent <...> ;; pairs, those with a > after end and < before end. (while (c-search-backward-char-property 'category 'c->-as-paren-syntax end) - (c-clear->-pair-props-if-match-before end))))) + (if (c-clear->-pair-props-if-match-before end) + (setq need-new-end t))) + + ;; Extend the fontification region, if needed. + (when need-new-beg + (goto-char new-beg) + (c-forward-syntactic-ws) + (and (< (point) c-new-BEG) (setq c-new-BEG (point)))) + + (when need-new-end + (and (> new-end c-new-END) (setq c-new-END new-end)))))) === modified file 'lisp/progmodes/cc-mode.el' --- lisp/progmodes/cc-mode.el 2010-04-29 14:48:32 +0000 +++ lisp/progmodes/cc-mode.el 2010-06-21 21:08:26 +0000 @@ -640,6 +640,8 @@ ;; Starting a mode is a sort of "change". So call the change functions... (save-restriction (widen) + (setq c-new-BEG (point-min)) + (setq c-new-END (point-max)) (save-excursion (if c-get-state-before-change-functions (mapc (lambda (fn) @@ -886,17 +888,19 @@ ;; inside a string, comment, or macro. (goto-char c-old-BOM) ; already set to old start of macro or begg. (setq c-new-BEG - (if (setq limits (c-state-literal-at (point))) - (cdr limits) ; go forward out of any string or comment. - (point))) + (min c-new-BEG + (if (setq limits (c-state-literal-at (point))) + (cdr limits) ; go forward out of any string or comment. + (point)))) (goto-char endd) (if (setq limits (c-state-literal-at (point))) (goto-char (car limits))) ; go backward out of any string or comment. (if (c-beginning-of-macro) (c-end-of-macro)) - (setq c-new-END (max (+ (- c-old-EOM old-len) (- endd begg)) - (point))) + (setq c-new-END (max c-new-END + (+ (- c-old-EOM old-len) (- endd begg)) + (point))) ;; Clear all old relevant properties. (c-clear-char-property-with-value c-new-BEG c-new-END 'syntax-table '(1)) ------------------------------------------------------------ revno: 100624 committer: Glenn Morris branch nick: trunk timestamp: Mon 2010-06-21 00:37:16 -0700 message: * INSTALL: Info files are compressed by default. diff: === modified file 'INSTALL' --- INSTALL 2010-06-16 20:08:41 +0000 +++ INSTALL 2010-06-21 07:37:16 +0000 @@ -105,8 +105,7 @@ Note that the install automatically saves space by compressing (provided you have the `gzip' program) those installed Lisp source (.el) - files that have corresponding .elc versions. You may also wish - to compress the installed Info files. + files that have corresponding .elc versions, as well as the Info files. ADDITIONAL DISTRIBUTION FILES ------------------------------------------------------------ revno: 100623 committer: Eli Zaretskii branch nick: trunk timestamp: Sun 2010-06-20 21:04:30 +0300 message: Avoid recentering when lines differ in their height. xdisp.c (try_scrolling): When scroll-conservatively is set to most-positive-fixnum, be extra accurate when scrolling window start, to avoid missing the cursor line. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2010-06-19 09:40:15 +0000 +++ src/ChangeLog 2010-06-20 18:04:30 +0000 @@ -1,3 +1,9 @@ +2010-06-20 Eli Zaretskii + + * xdisp.c (try_scrolling): When scroll-conservatively is set to + most-positive-fixnum, be extra accurate when scrolling window + start, to avoid missing the cursor line. + 2010-06-19 Eli Zaretskii * xdisp.c (try_scrolling): Compute the limit for searching point === modified file 'src/xdisp.c' --- src/xdisp.c 2010-06-19 11:57:19 +0000 +++ src/xdisp.c 2010-06-20 18:04:30 +0000 @@ -13486,7 +13486,26 @@ return SCROLLING_FAILED; start_display (&it, w, startp); - move_it_vertically (&it, amount_to_scroll); + if (scroll_max < INT_MAX) + move_it_vertically (&it, amount_to_scroll); + else + { + /* Extra precision for users who set scroll-conservatively + to most-positive-fixnum: make sure the amount we scroll + the window start is never less than amount_to_scroll, + which was computed as distance from window bottom to + point. This matters when lines at window top and lines + below window bottom have different height. */ + struct it it1 = it; + /* We use a temporary it1 because line_bottom_y can modify + its argument, if it moves one line down; see there. */ + int start_y = line_bottom_y (&it1); + + do { + move_it_by_lines (&it, 1, 1); + it1 = it; + } while (line_bottom_y (&it1) - start_y < amount_to_scroll); + } /* If STARTP is unchanged, move it down another screen line. */ if (CHARPOS (it.current.pos) == CHARPOS (startp))