Using saved parent location: http://bzr.savannah.gnu.org/r/emacs/trunk/ Now on revision 99599. ------------------------------------------------------------ revno: 99599 [merge] committer: Kenichi Handa branch nick: trunk timestamp: Tue 2010-03-02 13:55:33 +0900 message: Fix handling of the multibyte form of raw-bytes in unibyte->multibyte conversion. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2010-03-02 01:30:52 +0000 +++ src/ChangeLog 2010-03-02 04:44:28 +0000 @@ -1,5 +1,9 @@ 2010-03-02 Kenichi Handa + * character.c (parse_str_as_multibyte): Fix handling of the + multibyte form of raw-bytes. + (str_as_multibyte): Likewise. + * buffer.c (Fset_buffer_multibyte): Fix handling of the multibyte form of raw-bytes. === modified file 'src/character.c' --- src/character.c 2010-01-13 08:35:10 +0000 +++ src/character.c 2010-03-02 04:44:28 +0000 @@ -630,7 +630,8 @@ const unsigned char *adjusted_endp = endp - MAX_MULTIBYTE_LENGTH; while (str < adjusted_endp) { - if ((n = MULTIBYTE_LENGTH_NO_CHECK (str)) > 0) + if (! CHAR_BYTE8_HEAD_P (*str) + && (n = MULTIBYTE_LENGTH_NO_CHECK (str)) > 0) str += n, bytes += n; else str++, bytes += 2; @@ -639,7 +640,8 @@ } while (str < endp) { - if ((n = MULTIBYTE_LENGTH (str, endp)) > 0) + if (! CHAR_BYTE8_HEAD_P (*str) + && (n = MULTIBYTE_LENGTH (str, endp)) > 0) str += n, bytes += n; else str++, bytes += 2; @@ -673,10 +675,13 @@ { unsigned char *adjusted_endp = endp - MAX_MULTIBYTE_LENGTH; while (p < adjusted_endp + && ! CHAR_BYTE8_HEAD_P (*p) && (n = MULTIBYTE_LENGTH_NO_CHECK (p)) > 0) p += n, chars++; } - while ((n = MULTIBYTE_LENGTH (p, endp)) > 0) + while (p < endp + && ! CHAR_BYTE8_HEAD_P (*p) + && (n = MULTIBYTE_LENGTH (p, endp)) > 0) p += n, chars++; if (nchars) *nchars = chars; @@ -694,7 +699,8 @@ unsigned char *adjusted_endp = endp - MAX_MULTIBYTE_LENGTH; while (p < adjusted_endp) { - if ((n = MULTIBYTE_LENGTH_NO_CHECK (p)) > 0) + if (! CHAR_BYTE8_HEAD_P (*p) + && (n = MULTIBYTE_LENGTH_NO_CHECK (p)) > 0) { while (n--) *to++ = *p++; @@ -710,7 +716,8 @@ } while (p < endp) { - if ((n = MULTIBYTE_LENGTH (p, endp)) > 0) + if (! CHAR_BYTE8_HEAD_P (*p) + && (n = MULTIBYTE_LENGTH (p, endp)) > 0) { while (n--) *to++ = *p++; ------------------------------------------------------------ revno: 99598 committer: Glenn Morris branch nick: trunk timestamp: Mon 2010-03-01 19:47:19 -0800 message: Small tweaks to etc/refcards/Makefile rules for PDFs. * refcards/Makefile: For cs- and sk-, use pdfcsplain if available. (pl-refcard.pdf): Let presence of pdfmex be another test for the required TeX files. Pass explicit output-format to tex command. (orgcard.pdf): Use ps2pdf, since pdftex tends to produce a portrait layout rather than the desired landscape. diff: === modified file 'etc/ChangeLog' --- etc/ChangeLog 2010-03-01 09:06:49 +0000 +++ etc/ChangeLog 2010-03-02 03:47:19 +0000 @@ -1,3 +1,11 @@ +2010-03-02 Glenn Morris + + * refcards/Makefile: For cs- and sk-, use pdfcsplain if available. + (pl-refcard.pdf): Let presence of pdfmex be another test for the + required TeX files. Pass explicit output-format to tex command. + (orgcard.pdf): Use ps2pdf, since pdftex tends to produce a + portrait layout rather than the desired landscape. + 2010-03-01 Glenn Morris * refcards/pl-refcard.tex: Double forward-slashes in URL for Mex. === modified file 'etc/refcards/Makefile' --- etc/refcards/Makefile 2010-01-13 08:35:10 +0000 +++ etc/refcards/Makefile 2010-03-02 03:47:19 +0000 @@ -55,13 +55,19 @@ cs-refcard.pdf cs-dired-ref.pdf cs-survival.pdf sk-refcard.pdf \ sk-dired-ref.pdf sk-survival.pdf: %.pdf: %.tex - csplain "\pdfoutput=1\input $<" + if pdfcsplain --version > /dev/null 2> /dev/null; then \ + pdfcsplain $<; \ + else \ + csplain "\pdfoutput=1\input $<"; \ + fi +## Some versions of pdfmex seem to create dvi by default, hence output-format. pl-refcard.pdf: %.pdf: %.tex - if ! kpsewhich -format=fmt mex > /dev/null; then \ + if ! kpsewhich -format=fmt mex > /dev/null && \ + ! pdfmex --version > /dev/null 2> /dev/null; then \ echo "No mex format found."; false; \ fi - pdftex $< + pdftex -output-format=pdf $< ru-refcard.pdf: %.pdf: %.tex pdflatex $< @@ -75,6 +81,10 @@ gnus-booklet.pdf: gnus-refcard.tex gnus-logo.pdf pdflatex -jobname=gnus-booklet '\def\booklettrue{}\def\letterpapertrue{}\input{gnus-refcard}' +## FIXME just pdftex produces portrait rather than landscape. +orgcard.pdf: orgcard.ps + ps2pdf $< + ## Everything not explicitly listed above. %.pdf: %.tex pdftex $< ------------------------------------------------------------ revno: 99597 committer: Glenn Morris branch nick: trunk timestamp: Mon 2010-03-01 19:29:50 -0800 message: * FOR-RELEASE: CEDET and a javascript mode were added, so remove todos. diff: === modified file 'admin/FOR-RELEASE' --- admin/FOR-RELEASE 2009-11-30 16:11:18 +0000 +++ admin/FOR-RELEASE 2010-03-02 03:29:50 +0000 @@ -252,8 +252,6 @@ * PLANNED ADDITIONS -** CEDET (not for 23.1 due to paperwork issues, perhaps for 23.2) -** js2-mode ** pov-mode (probably not for Emacs-23: waiting for a Free POV-Ray). ** gas-mode ? ------------------------------------------------------------ revno: 99596 committer: Glenn Morris branch nick: trunk timestamp: Mon 2010-03-01 19:27:41 -0800 message: Fix date of Yom HaAtzma'ut holiday. * calendar/cal-hebrew.el (holiday-hebrew-passover): Fix date of Yom HaAtzma'ut when it falls on a Monday (rule changed in 2004). diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-03-01 17:46:36 +0000 +++ lisp/ChangeLog 2010-03-02 03:27:41 +0000 @@ -1,3 +1,8 @@ +2010-03-02 Glenn Morris + + * calendar/cal-hebrew.el (holiday-hebrew-passover): Fix date + of Yom HaAtzma'ut when it falls on a Monday (rule changed in 2004). + 2010-03-01 Alan Mackenzie * progmodes/cc-engine.el (c-remove-stale-state-cache): Correct === modified file 'lisp/calendar/cal-hebrew.el' --- lisp/calendar/cal-hebrew.el 2010-01-13 08:35:10 +0000 +++ lisp/calendar/cal-hebrew.el 2010-03-02 03:27:41 +0000 @@ -505,7 +505,9 @@ (+ abs-p 18) (if (= (% abs-p 7) 6) (+ abs-p 19) - (+ abs-p 20)))) + (if (= (% abs-p 7) 2) + (+ abs-p 21) + (+ abs-p 20))))) "Yom HaAtzma'ut") (list (calendar-gregorian-from-absolute (+ abs-p 33)) "Lag BaOmer") ------------------------------------------------------------ revno: 99595 [merge] committer: Kenichi Handa branch nick: trunk timestamp: Tue 2010-03-02 10:35:00 +0900 message: buffer.c (Fset_buffer_multibyte): Fix handling of the multibyte form of raw-bytes. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2010-02-28 14:19:31 +0000 +++ src/ChangeLog 2010-03-02 01:30:52 +0000 @@ -1,3 +1,8 @@ +2010-03-02 Kenichi Handa + + * buffer.c (Fset_buffer_multibyte): Fix handling of the multibyte + form of raw-bytes. + 2010-02-28 Chong Yidong * charset.c (load_charset_map_from_file) === modified file 'src/buffer.c' --- src/buffer.c 2010-01-13 04:33:42 +0000 +++ src/buffer.c 2010-03-02 01:30:52 +0000 @@ -2497,7 +2497,9 @@ if (ASCII_BYTE_P (*p)) p++, pos++; - else if (EQ (flag, Qt) && (bytes = MULTIBYTE_LENGTH (p, pend)) > 0) + else if (EQ (flag, Qt) + && ! CHAR_BYTE8_HEAD_P (*p) + && (bytes = MULTIBYTE_LENGTH (p, pend)) > 0) p += bytes, pos += bytes; else { ------------------------------------------------------------ revno: 99594 committer: Alan Mackenzie branch nick: trunk timestamp: Mon 2010-03-01 17:46:36 +0000 message: Correct buggy patch 99592 to cc-engine.el. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-03-01 11:50:57 +0000 +++ lisp/ChangeLog 2010-03-01 17:46:36 +0000 @@ -1,3 +1,8 @@ +2010-03-01 Alan Mackenzie + + * progmodes/cc-engine.el (c-remove-stale-state-cache): Correct + previous patch. + 2010-03-01 Kenichi Handa * language/burmese.el (burmese-composable-pattern): Renamed from === modified file 'lisp/progmodes/cc-engine.el' --- lisp/progmodes/cc-engine.el 2010-03-01 11:31:42 +0000 +++ lisp/progmodes/cc-engine.el 2010-03-01 17:46:36 +0000 @@ -2591,7 +2591,7 @@ (save-restriction (narrow-to-region 1 (point-max)) (save-excursion - (let* ((in-macro-start ; point-max or beginning of macro containing it + (let* ((in-macro-start ; start of macro containing (point-max) or nil. (save-excursion (goto-char (point-max)) (and (c-beginning-of-macro) @@ -2642,7 +2642,8 @@ ;; between `good-pos'/`good-pos-actual-macro-start' and (point-max), ;; due to the interface spec to this function. (setq pos (if (and good-pos-actual-macro-end - (> in-macro-start good-pos-actual-macro-start)) + (not (eq good-pos-actual-macro-start + in-macro-start))) (1+ good-pos-actual-macro-end) ; get outside the macro as ; marked by a `category' text property. good-pos)) ------------------------------------------------------------ revno: 99593 [merge] committer: Kenichi Handa branch nick: trunk timestamp: Mon 2010-03-01 20:52:21 +0900 message: Change "myanmar" to "burmese" diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-03-01 11:31:42 +0000 +++ lisp/ChangeLog 2010-03-01 11:50:57 +0000 @@ -1,3 +1,16 @@ +2010-03-01 Kenichi Handa + + * language/burmese.el (burmese-composable-pattern): Renamed from + myanmar-composable-pattern. + + * international/characters.el (script-list): Change myanmar to + burmese. + + * international/fontset.el (script-representative-chars): Change + myanmar to burmese. + (otf-script-alist): Likewise. + (setup-default-fontset): Likewise. Re-fix :otf spec. + 2010-03-01 Alan Mackenzie * cc-engine.el (c-remove-stale-state-cache): Take account of when === modified file 'lisp/international/characters.el' --- lisp/international/characters.el 2010-02-26 12:40:46 +0000 +++ lisp/international/characters.el 2010-03-01 11:34:11 +0000 @@ -1124,7 +1124,7 @@ (#x0E00 #x0E5F thai) (#x0E80 #x0EDF lao) (#x0F00 #x0FFF tibetan) - (#x1000 #x109F myanmar) + (#x1000 #x109F burmese) (#x10A0 #x10FF georgian) (#x1100 #x11FF hangul) (#x1200 #x139F ethiopic) @@ -1151,7 +1151,7 @@ (#x3400 #x9FAF han) (#xA000 #xA4CF yi) (#xAA00 #xAA5F cham) - (#xAA60 #xAA7B myanmar) + (#xAA60 #xAA7B burmese) (#xAA80 #xAADF tai-viet) (#xAC00 #xD7AF hangul) (#xF900 #xFAFF han) === modified file 'lisp/international/fontset.el' --- lisp/international/fontset.el 2010-02-27 15:02:09 +0000 +++ lisp/international/fontset.el 2010-03-01 11:50:57 +0000 @@ -169,7 +169,7 @@ (thai #xE17) (lao #xEA5) (tibetan #xF40) - (myanmar #x1000) + (burmese #x1000) (georgian #x10D3) (ethiopic #x1208) (cherokee #x13B6) @@ -260,7 +260,7 @@ (math . mathematical) (mong . mongolian) (musc . musical-symbol) - (mymr . myanmar) + (mymr . burmese) (nko\ . nko) (ogam . ogham) (ital . old_italic) @@ -415,8 +415,8 @@ (sinhala ,(font-spec :registry "iso10646-1" :otf '(sinh nil (akhn)))) (malayalam ,(font-spec :registry "iso10646-1" :otf '(mlym nil (akhn)))) - (myanmar ,(font-spec :registry "iso10646-1" :otf '(mymr brm (liga mark))) - ,(font-spec :registry "iso10646-1" :script 'myanmar)) + (burmese ,(font-spec :registry "iso10646-1" :otf '(mymr nil nil)) + ,(font-spec :registry "iso10646-1" :script 'burmese)) (lao ,(font-spec :registry "iso10646-1" :otf '(lao\ nil nil (mark))) ,(font-spec :registry "iso10646-1" :script 'lao) === modified file 'lisp/language/burmese.el' --- lisp/language/burmese.el 2010-02-26 12:40:46 +0000 +++ lisp/language/burmese.el 2010-03-01 11:34:11 +0000 @@ -36,7 +36,7 @@ (sample-text . "Burmese (မ္ရန္‌မာ) မင္‍ဂလာပာ") (documentation . t))) -(defvar myanmar-composable-pattern +(defvar burmese-composable-pattern (let ((table '(("K" . "[\u1004\u105A]\u103A\u1039") ; KINZI sequence ("C" . "[\u1000-\u102A\u103F\u1041-\u1049\u104E\u105A-\u105D\u1061\u1065-\u1066\u106E\u1071\u1075\u1081\u108E\uAA60-\uAA6F\uAA71-\uAA76]") ; consonant and vowel letter @@ -52,7 +52,7 @@ regexp t t)))) regexp)) -(let ((elt (list (vector myanmar-composable-pattern 0 'font-shape-gstring) +(let ((elt (list (vector burmese-composable-pattern 0 'font-shape-gstring) (vector "." 0 'font-shape-gstring)))) (set-char-table-range composition-function-table '(#x1000 . #x107F) elt) (set-char-table-range composition-function-table '(#xAA60 . #xAA7B) elt)) ------------------------------------------------------------ revno: 99592 committer: Alan Mackenzie branch nick: trunk timestamp: Mon 2010-03-01 11:31:42 +0000 message: Fix bug #5649: 23.1.92; Indentation problems in C mode. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-02-28 23:37:19 +0000 +++ lisp/ChangeLog 2010-03-01 11:31:42 +0000 @@ -1,3 +1,8 @@ +2010-03-01 Alan Mackenzie + + * cc-engine.el (c-remove-stale-state-cache): Take account of when + `good-pos' is in the same macro as `here'. Fixes bug 5649. + 2010-02-28 Katsumi Yamaoka * menu-bar.el (menu-bar-manuals-menu): Fix typo. === modified file 'lisp/progmodes/cc-engine.el' --- lisp/progmodes/cc-engine.el 2010-02-25 21:21:25 +0000 +++ lisp/progmodes/cc-engine.el 2010-03-01 11:31:42 +0000 @@ -2641,7 +2641,8 @@ ;; (car c-state-cache). There can be no open parens/braces/brackets ;; between `good-pos'/`good-pos-actual-macro-start' and (point-max), ;; due to the interface spec to this function. - (setq pos (if good-pos-actual-macro-end + (setq pos (if (and good-pos-actual-macro-end + (> in-macro-start good-pos-actual-macro-start)) (1+ good-pos-actual-macro-end) ; get outside the macro as ; marked by a `category' text property. good-pos)) ------------------------------------------------------------ revno: 99591 committer: Glenn Morris branch nick: trunk timestamp: Mon 2010-03-01 01:15:04 -0800 message: Regenerate pl-refcard.pdf. diff: === modified file 'etc/refcards/pl-refcard.pdf' Binary files etc/refcards/pl-refcard.pdf 2009-07-16 03:25:00 +0000 and etc/refcards/pl-refcard.pdf 2010-03-01 09:15:04 +0000 differ ------------------------------------------------------------ revno: 99590 committer: Glenn Morris branch nick: trunk timestamp: Mon 2010-03-01 01:06:49 -0800 message: * refcards/pl-refcard.tex: Double forward-slashes in URL for Mex. diff: === modified file 'etc/ChangeLog' --- etc/ChangeLog 2010-03-01 08:56:58 +0000 +++ etc/ChangeLog 2010-03-01 09:06:49 +0000 @@ -1,5 +1,7 @@ 2010-03-01 Glenn Morris + * refcards/pl-refcard.tex: Double forward-slashes in URL for Mex. + * refcards/de-refcard.tex: Fix paren typo. * refcards/ru-refcard.tex: Rename \year command to \cyear, since === modified file 'etc/refcards/pl-refcard.tex' --- etc/refcards/pl-refcard.tex 2010-03-01 02:36:15 +0000 +++ etc/refcards/pl-refcard.tex 2010-03-01 09:06:49 +0000 @@ -92,7 +92,7 @@ For copies of the GNU Emacs manual, see: -{\tt http://www.gnu.org/software/emacs/\#Manuals} +{\tt http:////www.gnu.org//software//emacs//\#Manuals} \endgroup} % make \bye not \outer so that the \def\bye in the \else clause below ------------------------------------------------------------ revno: 99589 committer: Glenn Morris branch nick: trunk timestamp: Mon 2010-03-01 00:58:52 -0800 message: Regenerate de-refcard.pdf. diff: === modified file 'etc/refcards/de-refcard.pdf' Binary files etc/refcards/de-refcard.pdf 2009-05-20 01:41:14 +0000 and etc/refcards/de-refcard.pdf 2010-03-01 08:58:52 +0000 differ ------------------------------------------------------------ revno: 99588 committer: Glenn Morris branch nick: trunk timestamp: Mon 2010-03-01 00:56:58 -0800 message: * refcards/de-refcard.tex: Fix paren typo. diff: === modified file 'etc/ChangeLog' --- etc/ChangeLog 2010-03-01 07:13:57 +0000 +++ etc/ChangeLog 2010-03-01 08:56:58 +0000 @@ -1,5 +1,7 @@ 2010-03-01 Glenn Morris + * refcards/de-refcard.tex: Fix paren typo. + * refcards/ru-refcard.tex: Rename \year command to \cyear, since the former seems to be already used in some TeX installations. === modified file 'etc/refcards/de-refcard.tex' --- etc/refcards/de-refcard.tex 2010-03-01 02:36:15 +0000 +++ etc/refcards/de-refcard.tex 2010-03-01 08:56:58 +0000 @@ -83,7 +83,7 @@ F\"ur Kopien des Handbuchs zu GNU Emacs: -\tt http://www.gnu.org/software/emacs/\#Manuals} +{\tt http://www.gnu.org/software/emacs/\#Manuals} \endgroup} % make \bye not \outer so that the \def\bye in the \else clause below ------------------------------------------------------------ revno: 99587 committer: Glenn Morris branch nick: trunk timestamp: Mon 2010-03-01 00:06:52 -0800 message: Regenerate most pdf refcards. This mainly just updates the copyright notices. The exceptions are: orgcard.pdf - already committed previously with .tex changes, by mistake de-refcard.pdf, pl-refcard.pdf - Debian's texlive installation has defeated me diff: === modified file 'etc/refcards/calccard.pdf' Binary files etc/refcards/calccard.pdf 2009-07-15 03:22:38 +0000 and etc/refcards/calccard.pdf 2010-03-01 08:06:52 +0000 differ === modified file 'etc/refcards/cs-dired-ref.pdf' Binary files etc/refcards/cs-dired-ref.pdf 2009-07-16 03:16:41 +0000 and etc/refcards/cs-dired-ref.pdf 2010-03-01 08:06:52 +0000 differ === modified file 'etc/refcards/cs-refcard.pdf' Binary files etc/refcards/cs-refcard.pdf 2009-07-16 03:16:41 +0000 and etc/refcards/cs-refcard.pdf 2010-03-01 08:06:52 +0000 differ === modified file 'etc/refcards/dired-ref.pdf' Binary files etc/refcards/dired-ref.pdf 2009-07-15 03:22:38 +0000 and etc/refcards/dired-ref.pdf 2010-03-01 08:06:52 +0000 differ === modified file 'etc/refcards/fr-dired-ref.pdf' Binary files etc/refcards/fr-dired-ref.pdf 2009-07-16 03:16:41 +0000 and etc/refcards/fr-dired-ref.pdf 2010-03-01 08:06:52 +0000 differ === modified file 'etc/refcards/fr-refcard.pdf' Binary files etc/refcards/fr-refcard.pdf 2009-05-20 01:41:14 +0000 and etc/refcards/fr-refcard.pdf 2010-03-01 08:06:52 +0000 differ === modified file 'etc/refcards/gnus-booklet.pdf' Binary files etc/refcards/gnus-booklet.pdf 2009-07-16 02:29:51 +0000 and etc/refcards/gnus-booklet.pdf 2010-03-01 08:06:52 +0000 differ === modified file 'etc/refcards/gnus-refcard.pdf' Binary files etc/refcards/gnus-refcard.pdf 2009-07-16 02:29:51 +0000 and etc/refcards/gnus-refcard.pdf 2010-03-01 08:06:52 +0000 differ === modified file 'etc/refcards/pt-br-refcard.pdf' Binary files etc/refcards/pt-br-refcard.pdf 2009-07-15 03:22:38 +0000 and etc/refcards/pt-br-refcard.pdf 2010-03-01 08:06:52 +0000 differ === modified file 'etc/refcards/refcard.pdf' Binary files etc/refcards/refcard.pdf 2009-05-19 01:46:13 +0000 and etc/refcards/refcard.pdf 2010-03-01 08:06:52 +0000 differ === modified file 'etc/refcards/ru-refcard.pdf' Binary files etc/refcards/ru-refcard.pdf 2009-07-17 03:56:17 +0000 and etc/refcards/ru-refcard.pdf 2010-03-01 08:06:52 +0000 differ === modified file 'etc/refcards/sk-dired-ref.pdf' Binary files etc/refcards/sk-dired-ref.pdf 2009-07-16 03:16:41 +0000 and etc/refcards/sk-dired-ref.pdf 2010-03-01 08:06:52 +0000 differ === modified file 'etc/refcards/sk-refcard.pdf' Binary files etc/refcards/sk-refcard.pdf 2009-07-16 03:16:41 +0000 and etc/refcards/sk-refcard.pdf 2010-03-01 08:06:52 +0000 differ ------------------------------------------------------------ revno: 99586 committer: Glenn Morris branch nick: trunk timestamp: Sun 2010-02-28 23:13:57 -0800 message: Rename a command in ru-refcard.tex. * refcards/ru-refcard.tex: Rename \year command to \cyear, since the former seems to be already used in some TeX installations. diff: === modified file 'etc/ChangeLog' --- etc/ChangeLog 2010-03-01 02:40:56 +0000 +++ etc/ChangeLog 2010-03-01 07:13:57 +0000 @@ -1,5 +1,8 @@ 2010-03-01 Glenn Morris + * refcards/ru-refcard.tex: Rename \year command to \cyear, since + the former seems to be already used in some TeX installations. + * refcards/calccard.tex, refcards/cs-dired-ref.tex: * refcards/cs-refcard.tex, refcards/cs-survival.tex: * refcards/de-refcard.tex, refcards/dired-ref.tex: === modified file 'etc/refcards/ru-refcard.tex' --- etc/refcards/ru-refcard.tex 2010-03-01 02:36:15 +0000 +++ etc/refcards/ru-refcard.tex 2010-03-01 07:13:57 +0000 @@ -23,15 +23,15 @@ \setlength{\ColThreeWidth}{25mm} \newcommand{\versionemacs}[0]{23} % version of Emacs this is for -\newcommand{\year}[0]{2010} % copyright year +\newcommand{\cyear}[0]{2010} % copyright year \newcommand\shortcopyrightnotice[0]{\vskip 1ex plus 2 fill - \centerline{\footnotesize \copyright\ \year\ Free Software Foundation, Inc. + \centerline{\footnotesize \copyright\ \cyear\ Free Software Foundation, Inc. Permissions on back.}} \newcommand\copyrightnotice[0]{ \vskip 1ex plus 2 fill\begingroup\footnotesize -\centerline{Copyright \copyright\ \year\ Free Software Foundation, Inc.} +\centerline{Copyright \copyright\ \cyear\ Free Software Foundation, Inc.} \centerline{For GNU Emacs version \versionemacs} \centerline{Designed by Stephen Gildea} \centerline{ Alex Ott } ------------------------------------------------------------ Use --include-merges or -n0 to see merged revisions.