[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r113698: * calendar/calendar.el (calendar-generate-m
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] trunk r113698: * calendar/calendar.el (calendar-generate-month, calendar-font-lock-keywords): |
Date: |
Mon, 05 Aug 2013 06:58:06 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 113698
revision-id: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sun 2013-08-04 23:54:30 -0700
message:
* calendar/calendar.el (calendar-generate-month, calendar-font-lock-keywords):
Fix for calendar-day-header-width > length of any day name.
modified:
lisp/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1432
lisp/calendar/calendar.el calendar.el-20091113204419-o5vbwnq5f7feedwu-478
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2013-08-05 06:49:37 +0000
+++ b/lisp/ChangeLog 2013-08-05 06:54:30 +0000
@@ -2,6 +2,8 @@
* calendar/calendar.el (calendar-generate-month):
Fix for calendar-column-width != 1 + calendar-day-digit-width.
+ (calendar-generate-month, calendar-font-lock-keywords):
+ Fix for calendar-day-header-width > length of any day name.
2013-08-05 Juanma Barranquero <address@hidden>
=== modified file 'lisp/calendar/calendar.el'
--- a/lisp/calendar/calendar.el 2013-08-05 06:49:37 +0000
+++ b/lisp/calendar/calendar.el 2013-08-05 06:54:30 +0000
@@ -1532,9 +1532,7 @@
(progn
(setq string
(calendar-day-name (mod (+ calendar-week-start-day i) 7) nil t))
- (if enable-multibyte-characters
- (truncate-string-to-width string calendar-day-header-width)
- (substring string 0 calendar-day-header-width)))
+ (truncate-string-to-width string calendar-day-header-width nil ?\s))
(make-string (- calendar-column-width calendar-day-header-width) ?\s)))
(calendar-ensure-newline)
(calendar-insert-at-column indent calendar-intermonth-text trunc)
@@ -1548,9 +1546,8 @@
(format (format "%%%dd" calendar-day-digit-width) day)
'mouse-face 'highlight
'help-echo (eval calendar-date-echo-text)
- ;; 'date property prevents intermonth text confusing
- ;; re-searches. (Tried intangible, it did not
- ;; really work.)
+ ;; 'date property prevents intermonth text confusing re-searches.
+ ;; (Tried intangible, it did not really work.)
'date t)
(make-string
(- calendar-column-width calendar-day-digit-width) ?\s))
@@ -2292,14 +2289,15 @@
" -?[0-9]+")
. font-lock-function-name-face)
(,(regexp-opt
- (list (substring (aref calendar-day-name-array 6)
- 0 calendar-day-header-width)
- (substring (aref calendar-day-name-array 0)
- 0 calendar-day-header-width)))
+ (list (truncate-string-to-width (aref calendar-day-name-array 6)
+ calendar-day-header-width)
+ (truncate-string-to-width (aref calendar-day-name-array 0)
+ calendar-day-header-width)))
;; Saturdays and Sundays are highlighted differently.
. font-lock-comment-face)
;; First two chars of each day are used in the calendar.
- (,(regexp-opt (mapcar (lambda (x) (substring x 0
calendar-day-header-width))
+ (,(regexp-opt (mapcar (lambda (x) (truncate-string-to-width
+ x calendar-day-header-width))
calendar-day-name-array))
. font-lock-constant-face))
"Default keywords to highlight in Calendar mode.")
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r113698: * calendar/calendar.el (calendar-generate-month, calendar-font-lock-keywords):,
Glenn Morris <=