------------------------------------------------------------ revno: 117363 committer: Stefan Monnier branch nick: trunk timestamp: Wed 2014-06-18 15:38:00 -0400 message: * lisp/play/bubbles.el (bubbles--initialize, bubbles--show-scores) (bubbles--game-over): Don't add `intangible' properties since they didn't work anyway. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-06-18 08:54:11 +0000 +++ lisp/ChangeLog 2014-06-18 19:38:00 +0000 @@ -1,3 +1,9 @@ +2014-06-18 Stefan Monnier + + * play/bubbles.el (bubbles--initialize, bubbles--show-scores) + (bubbles--game-over): Don't add `intangible' properties since they + didn't work anyway. + 2014-06-18 Juri Linkov * vc/ediff-init.el (ediff-current-diff-Ancestor) === modified file 'lisp/play/bubbles.el' --- lisp/play/bubbles.el 2014-01-12 05:29:11 +0000 +++ lisp/play/bubbles.el 2014-06-18 19:38:00 +0000 @@ -1005,20 +1005,17 @@ (set-buffer-modified-p nil) (erase-buffer) (insert " ") - (add-text-properties - (point-min) (point) (list 'intangible t 'display - (cons 'space - (list :height bubbles--row-offset)))) + (put-text-property (point-min) (point) + 'display + (cons 'space (list :height bubbles--row-offset))) (insert "\n") (let ((max-char (length (bubbles--colors)))) (dotimes (i (bubbles--grid-height)) (let ((p (point))) (insert " ") - (add-text-properties - p (point) (list 'intangible t - 'display (cons 'space - (list :width - bubbles--col-offset))))) + (put-text-property p (point) + 'display + (cons 'space (list :width bubbles--col-offset)))) (dotimes (j (bubbles--grid-width)) (let* ((index (random max-char)) (char (nth index bubbles-chars))) @@ -1026,10 +1023,9 @@ (add-text-properties (1- (point)) (point) (list 'index index)))) (insert "\n")) (insert "\n ") - (add-text-properties - (1- (point)) (point) (list 'intangible t 'display - (cons 'space - (list :width bubbles--col-offset))))) + (put-text-property (1- (point)) (point) + 'display + (cons 'space (list :width bubbles--col-offset)))) (put-text-property (point-min) (point-max) 'pointer 'arrow)) (bubbles-mode) (bubbles--reset-score) @@ -1179,10 +1175,9 @@ (delete-region (point) (point-max)) (insert (format "Selected: %4d\n" bubbles--neighborhood-score)) (insert " ") - (add-text-properties (1- (point)) (point) - (list 'intangible t 'display - (cons 'space - (list :width bubbles--col-offset)))) + (put-text-property (1- (point)) (point) + 'display + (cons 'space (list :width bubbles--col-offset))) (insert (format "Score: %4d" bubbles--score)) (put-text-property pos (point) 'status t)))) @@ -1200,10 +1195,9 @@ (goto-char (point-max)) (let* ((inhibit-read-only t)) (insert "\n ") - (add-text-properties (1- (point)) (point) - (list 'intangible t 'display - (cons 'space - (list :width bubbles--col-offset)))) + (put-text-property (1- (point)) (point) + 'display + (cons 'space (list :width bubbles--col-offset))) (insert "Game Over!")) ;; save score (gamegrid-add-score (format "bubbles-%s-%d-%d-%d-scores" ------------------------------------------------------------ revno: 117362 fixes bug: http://debbugs.gnu.org/10181 committer: Juri Linkov branch nick: trunk timestamp: Wed 2014-06-18 11:54:11 +0300 message: * lisp/vc/ediff-init.el (ediff-current-diff-Ancestor) (ediff-fine-diff-Ancestor, ediff-even-diff-A, ediff-even-diff-B) (ediff-even-diff-C, ediff-even-diff-Ancestor, ediff-odd-diff-A) (ediff-odd-diff-B, ediff-odd-diff-C, ediff-odd-diff-Ancestor): Add `min-colors 88' version with removed black/white foregrounds. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-06-18 08:48:49 +0000 +++ lisp/ChangeLog 2014-06-18 08:54:11 +0000 @@ -1,5 +1,14 @@ 2014-06-18 Juri Linkov + * vc/ediff-init.el (ediff-current-diff-Ancestor) + (ediff-fine-diff-Ancestor, ediff-even-diff-A, ediff-even-diff-B) + (ediff-even-diff-C, ediff-even-diff-Ancestor, ediff-odd-diff-A) + (ediff-odd-diff-B, ediff-odd-diff-C, ediff-odd-diff-Ancestor): + Add `min-colors 88' version with removed black/white foregrounds. + (Bug#10181) + +2014-06-18 Juri Linkov + * vc/diff-mode.el (diff-changed): Empty face definition to use `diff-removed' and `diff-added' on tty as well. (Bug#10181) (diff-context): Use darker color on light background and === modified file 'lisp/vc/ediff-init.el' --- lisp/vc/ediff-init.el 2014-05-03 02:27:46 +0000 +++ lisp/vc/ediff-init.el 2014-06-18 08:54:11 +0000 @@ -949,7 +949,9 @@ (defface ediff-current-diff-Ancestor (if (featurep 'emacs) - '((((class color) (min-colors 16)) + '((((class color) (min-colors 88)) + (:background "VioletRed")) + (((class color) (min-colors 16)) (:foreground "Black" :background "VioletRed")) (((class color)) (:foreground "black" :background "magenta3")) @@ -1057,7 +1059,9 @@ (defface ediff-fine-diff-Ancestor (if (featurep 'emacs) - '((((class color) (min-colors 16)) + '((((class color) (min-colors 88)) + (:background "Green")) + (((class color) (min-colors 16)) (:foreground "Black" :background "Green")) (((class color)) (:foreground "red3" :background "green")) @@ -1091,6 +1095,8 @@ (if (featurep 'emacs) `((((type pc)) (:foreground "green3" :background "light grey")) + (((class color) (min-colors 88)) + (:background "light grey")) (((class color) (min-colors 16)) (:foreground "Black" :background "light grey")) (((class color)) @@ -1115,7 +1121,9 @@ (defface ediff-even-diff-B (if (featurep 'emacs) - `((((class color) (min-colors 16)) + `((((class color) (min-colors 88)) + (:background "Grey")) + (((class color) (min-colors 16)) (:foreground "White" :background "Grey")) (((class color)) (:foreground "blue3" :background "Grey" :weight bold)) @@ -1138,6 +1146,8 @@ (if (featurep 'emacs) `((((type pc)) (:foreground "yellow3" :background "light grey")) + (((class color) (min-colors 88)) + (:background "light grey")) (((class color) (min-colors 16)) (:foreground "Black" :background "light grey")) (((class color)) @@ -1164,6 +1174,8 @@ (if (featurep 'emacs) `((((type pc)) (:foreground "cyan3" :background "light grey")) + (((class color) (min-colors 88)) + (:background "Grey")) (((class color) (min-colors 16)) (:foreground "White" :background "Grey")) (((class color)) @@ -1197,6 +1209,8 @@ (if (featurep 'emacs) '((((type pc)) (:foreground "green3" :background "gray40")) + (((class color) (min-colors 88)) + (:background "Grey")) (((class color) (min-colors 16)) (:foreground "White" :background "Grey")) (((class color)) @@ -1222,6 +1236,8 @@ (if (featurep 'emacs) '((((type pc)) (:foreground "White" :background "gray40")) + (((class color) (min-colors 88)) + (:background "light grey")) (((class color) (min-colors 16)) (:foreground "Black" :background "light grey")) (((class color)) @@ -1246,6 +1262,8 @@ (if (featurep 'emacs) '((((type pc)) (:foreground "yellow3" :background "gray40")) + (((class color) (min-colors 88)) + (:background "Grey")) (((class color) (min-colors 16)) (:foreground "White" :background "Grey")) (((class color)) @@ -1268,7 +1286,9 @@ (defface ediff-odd-diff-Ancestor (if (featurep 'emacs) - '((((class color) (min-colors 16)) + '((((class color) (min-colors 88)) + (:background "gray40")) + (((class color) (min-colors 16)) (:foreground "cyan3" :background "gray40")) (((class color)) (:foreground "green3" :background "black" :weight bold)) ------------------------------------------------------------ revno: 117361 fixes bug: http://debbugs.gnu.org/10181 committer: Juri Linkov branch nick: trunk timestamp: Wed 2014-06-18 11:48:49 +0300 message: * lisp/vc/diff-mode.el (diff-changed): Empty face definition to use `diff-removed' and `diff-added' on tty as well. (diff-context): Use darker color on light background and lighter color on dark background. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-06-18 08:33:57 +0000 +++ lisp/ChangeLog 2014-06-18 08:48:49 +0000 @@ -1,5 +1,12 @@ 2014-06-18 Juri Linkov + * vc/diff-mode.el (diff-changed): Empty face definition to use + `diff-removed' and `diff-added' on tty as well. (Bug#10181) + (diff-context): Use darker color on light background and + lighter color on dark background. + +2014-06-18 Juri Linkov + * vc/diff-mode.el (diff-refine-changed): Rename from `diff-refine-change' for consistency with `diff-changed'. (diff-refine-change): Add obsolete face alias. (Bug#10181) === modified file 'lisp/vc/diff-mode.el' --- lisp/vc/diff-mode.el 2014-06-18 08:33:57 +0000 +++ lisp/vc/diff-mode.el 2014-06-18 08:48:49 +0000 @@ -302,14 +302,9 @@ (defvar diff-added-face 'diff-added) (defface diff-changed - ;; We normally apply a `shadow'-based face on the `diff-context' - ;; face, and keep `diff-changed' the default. - '((((class color grayscale) (min-colors 88))) - ;; If the terminal lacks sufficient colors for shadowing, - ;; highlight changed lines explicitly. - (((class color)) - :foreground "yellow")) + '((t nil)) "`diff-mode' face used to highlight changed lines." + :version "24.5" :group 'diff-mode) (define-obsolete-face-alias 'diff-changed-face 'diff-changed "22.1") (defvar diff-changed-face 'diff-changed) @@ -343,8 +338,12 @@ (defvar diff-function-face 'diff-function) (defface diff-context - '((((class color grayscale) (min-colors 88)) :inherit shadow)) + '((((class color grayscale) (min-colors 88) (background light)) + :foreground "#333333") + (((class color grayscale) (min-colors 88) (background dark)) + :foreground "#dddddd")) "`diff-mode' face used to highlight context and other side-information." + :version "24.5" :group 'diff-mode) (define-obsolete-face-alias 'diff-context-face 'diff-context "22.1") (defvar diff-context-face 'diff-context) ------------------------------------------------------------ revno: 117360 fixes bug: http://debbugs.gnu.org/10181 committer: Juri Linkov branch nick: trunk timestamp: Wed 2014-06-18 11:33:57 +0300 message: * lisp/vc/diff-mode.el (diff-refine-changed): Rename from `diff-refine-change' for consistency with `diff-changed'. (diff-refine-change): Add obsolete face alias. * lisp/vc/smerge-mode.el (smerge-refined-changed): Rename from `smerge-refined-change'. (smerge-refined-change): Add obsolete face alias. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-06-17 19:33:58 +0000 +++ lisp/ChangeLog 2014-06-18 08:33:57 +0000 @@ -1,3 +1,13 @@ +2014-06-18 Juri Linkov + + * vc/diff-mode.el (diff-refine-changed): Rename from + `diff-refine-change' for consistency with `diff-changed'. + (diff-refine-change): Add obsolete face alias. (Bug#10181) + + * vc/smerge-mode.el (smerge-refined-changed): Rename from + `smerge-refined-change'. + (smerge-refined-change): Add obsolete face alias. + 2014-06-17 Stefan Monnier * rect.el (rectangle-preview): New custom. === modified file 'lisp/vc/diff-mode.el' --- lisp/vc/diff-mode.el 2014-01-01 07:43:34 +0000 +++ lisp/vc/diff-mode.el 2014-06-18 08:33:57 +0000 @@ -1916,7 +1916,7 @@ ;;; Fine change highlighting. -(defface diff-refine-change +(defface diff-refine-changed '((((class color) (min-colors 88) (background light)) :background "#ffff55") (((class color) (min-colors 88) (background dark)) @@ -1924,6 +1924,7 @@ (t :inverse-video t)) "Face used for char-based changes shown by `diff-refine-hunk'." :group 'diff-mode) +(define-obsolete-face-alias 'diff-refine-change 'diff-refine-changed "24.5") (defface diff-refine-removed '((default === modified file 'lisp/vc/smerge-mode.el' --- lisp/vc/smerge-mode.el 2014-01-01 07:43:34 +0000 +++ lisp/vc/smerge-mode.el 2014-06-18 08:33:57 +0000 @@ -116,9 +116,10 @@ (define-obsolete-face-alias 'smerge-markers-face 'smerge-markers "22.1") (defvar smerge-markers-face 'smerge-markers) -(defface smerge-refined-change +(defface smerge-refined-changed '((t nil)) "Face used for char-based changes shown by `smerge-refine'.") +(define-obsolete-face-alias 'smerge-refined-change 'smerge-refined-changed "24.5") (defface smerge-refined-removed '((default