From d58cba753997eba892a0f4c9a642c5cfc77099f6 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Mon, 9 Jan 2012 17:13:27 +0800 Subject: Backport Bug#9990 fix from trunk * src/dispnew.c (scrolling_window): Fix incorrect indices in accessing current_matrix and desired_matrix. (Bug#9990) --- src/ChangeLog | 5 +++++ src/dispnew.c | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index d006f58b8b6..55cc8e8bf27 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2012-01-09 Eli Zaretskii + + * dispnew.c (scrolling_window): Fix incorrect indices in accessing + current_matrix and desired_matrix. (Bug#9990) + 2011-10-31 YAMAMOTO Mitsuharu * xmenu.c (cleanup_widget_value_tree): New function. diff --git a/src/dispnew.c b/src/dispnew.c index d2878a4fa57..c116c3f7c47 100644 --- a/src/dispnew.c +++ b/src/dispnew.c @@ -5035,10 +5035,10 @@ scrolling_window (w, header_line_p) j = last_old; while (i - 1 > first_new && j - 1 > first_old - && MATRIX_ROW (current_matrix, i - 1)->enabled_p - && (MATRIX_ROW (current_matrix, i - 1)->y - == MATRIX_ROW (desired_matrix, j - 1)->y) - && !MATRIX_ROW (desired_matrix, j - 1)->redraw_fringe_bitmaps_p + && MATRIX_ROW (current_matrix, j - 1)->enabled_p + && (MATRIX_ROW (current_matrix, j - 1)->y + == MATRIX_ROW (desired_matrix, i - 1)->y) + && !MATRIX_ROW (desired_matrix, i - 1)->redraw_fringe_bitmaps_p && row_equal_p (w, MATRIX_ROW (desired_matrix, i - 1), MATRIX_ROW (current_matrix, j - 1), 1)) -- cgit v1.2.1 From de92a50b9e157cac071355b9836717e62b9edff1 Mon Sep 17 00:00:00 2001 From: YAMAMOTO Mitsuharu Date: Mon, 9 Jan 2012 17:23:36 +0800 Subject: Fix glitch in scrolling_window (backport from trunk). * dispnew.c (scrolling_window): Truncate overlaps in copy destination of scroll runs so as to avoid assigning disabled bogus rows and unnecessary graphics copy operations. --- src/ChangeLog | 6 +++++ src/dispnew.c | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++++------- 2 files changed, 72 insertions(+), 8 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 55cc8e8bf27..d0c89f2e44c 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2012-01-09 YAMAMOTO Mitsuharu + + * dispnew.c (scrolling_window): Truncate overlaps in copy + destination of scroll runs so as to avoid assigning disabled bogus + rows and unnecessary graphics copy operations. + 2012-01-09 Eli Zaretskii * dispnew.c (scrolling_window): Fix incorrect indices in accessing diff --git a/src/dispnew.c b/src/dispnew.c index c116c3f7c47..45ad9df7da9 100644 --- a/src/dispnew.c +++ b/src/dispnew.c @@ -5208,18 +5208,69 @@ scrolling_window (w, header_line_p) { rif->clear_window_mouse_face (w); rif->scroll_run_hook (w, r); + } + + /* Truncate runs that copy to where we copied to, and + invalidate runs that copy from where we copied to. */ + for (j = nruns - 1; j > i; --j) + { + struct run *p = runs[j]; + int truncated_p = 0; - /* Invalidate runs that copy from where we copied to. */ - for (j = i + 1; j < nruns; ++j) + if (p->nrows > 0 + && p->desired_y < r->desired_y + r->height + && p->desired_y + p->height > r->desired_y) { - struct run *p = runs[j]; + if (p->desired_y < r->desired_y) + { + p->nrows = r->desired_vpos - p->desired_vpos; + p->height = r->desired_y - p->desired_y; + truncated_p = 1; + } + else + { + int nrows_copied = (r->desired_vpos + r->nrows + - p->desired_vpos); + + if (p->nrows <= nrows_copied) + p->nrows = 0; + else + { + int height_copied = (r->desired_y + r->height + - p->desired_y); + + p->current_vpos += nrows_copied; + p->desired_vpos += nrows_copied; + p->nrows -= nrows_copied; + p->current_y += height_copied; + p->desired_y += height_copied; + p->height -= height_copied; + truncated_p = 1; + } + } + } - if ((p->current_y >= r->desired_y + if (r->current_y != r->desired_y + /* The condition below is equivalent to + ((p->current_y >= r->desired_y && p->current_y < r->desired_y + r->height) - || (p->current_y + p->height >= r->desired_y + || (p->current_y + p->height > r->desired_y && (p->current_y + p->height - < r->desired_y + r->height))) - p->nrows = 0; + <= r->desired_y + r->height))) + because we have 0 < p->height <= r->height. */ + && p->current_y < r->desired_y + r->height + && p->current_y + p->height > r->desired_y) + p->nrows = 0; + + /* Reorder runs by copied pixel lines if truncated. */ + if (truncated_p && p->nrows > 0) + { + int k = nruns - 1; + + while (runs[k]->nrows == 0 || runs[k]->height < p->height) + k--; + memmove (runs + j, runs + j + 1, (k - j) * sizeof (*runs)); + runs[k] = p; } } @@ -5234,7 +5285,14 @@ scrolling_window (w, header_line_p) to_overlapped_p = to->overlapped_p; from->redraw_fringe_bitmaps_p = from->fringe_bitmap_periodic_p; assign_row (to, from); - to->enabled_p = 1, from->enabled_p = 0; + /* The above `assign_row' actually does swap, so if we had + an overlap in the copy destination of two runs, then + the second run would assign a previously disabled bogus + row. But thanks to the truncation code in the + preceding for-loop, we no longer have such an overlap, + and thus the assigned row should always be enabled. */ + xassert (to->enabled_p); + from->enabled_p = 0; to->overlapped_p = to_overlapped_p; } } -- cgit v1.2.1 From 0c5b9eef72cbb54964d34c28ddffd17a0646bc87 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Mon, 9 Jan 2012 17:27:02 +0800 Subject: Fix use of uninitialized variable (backport from trunk). * xdisp.c (note_mouse_highlight): Initialize `part', to avoid a possible random value that matches one of those tested as condition to clear the mouse face. --- src/ChangeLog | 6 ++++++ src/xdisp.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/ChangeLog b/src/ChangeLog index d0c89f2e44c..c819bb08369 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2012-01-09 Eli Zaretskii + + * xdisp.c (note_mouse_highlight): Initialize `part', to avoid a + possible random value that matches one of those tested as + condition to clear the mouse face. + 2012-01-09 YAMAMOTO Mitsuharu * dispnew.c (scrolling_window): Truncate overlaps in copy diff --git a/src/xdisp.c b/src/xdisp.c index ebd660acc06..8e5cf3d8f3e 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -23484,7 +23484,7 @@ note_mouse_highlight (f, x, y) int x, y; { Display_Info *dpyinfo = FRAME_X_DISPLAY_INFO (f); - enum window_part part; + enum window_part part = ON_NOTHING; Lisp_Object window; struct window *w; Cursor cursor = No_Cursor; -- cgit v1.2.1 From d12815f82606816370e32309deefa8081de64d51 Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Mon, 9 Jan 2012 17:35:21 +0800 Subject: Fix use of uninitialized var (backport from trunk). * xdisp.c (note_mouse_highlight): Fix use of uninitialized var. --- src/ChangeLog | 4 ++++ src/xdisp.c | 13 ++++++++----- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index c819bb08369..fcaff20727d 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2012-01-09 Chong Yidong + + * xdisp.c (note_mouse_highlight): Fix use of uninitialized var. + 2012-01-09 Eli Zaretskii * xdisp.c (note_mouse_highlight): Initialize `part', to avoid a diff --git a/src/xdisp.c b/src/xdisp.c index 8e5cf3d8f3e..ed0cff5ce82 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -23518,11 +23518,14 @@ note_mouse_highlight (f, x, y) /* Which window is that in? */ window = window_from_coordinates (f, x, y, &part, 0, 0, 1); - /* If we were displaying active text in another window, clear that. - Also clear if we move out of text area in same window. */ - if (! EQ (window, dpyinfo->mouse_face_window) - || (part != ON_TEXT && part != ON_MODE_LINE && part != ON_HEADER_LINE - && !NILP (dpyinfo->mouse_face_window))) + /* If displaying active text in another window, clear that. */ + if (! EQ (window, hlinfo->mouse_face_window) + /* Also clear if we move out of text area in same window. */ + || (!NILP (hlinfo->mouse_face_window) + && !NILP (window) + && part != ON_TEXT + && part != ON_MODE_LINE + && part != ON_HEADER_LINE)) clear_mouse_face (dpyinfo); /* Not on a window -> return. */ -- cgit v1.2.1 From 3f235eece06afee170bf143cfde2ca8702384e75 Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Mon, 9 Jan 2012 17:40:11 +0800 Subject: Fix last commit. --- src/xdisp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/xdisp.c b/src/xdisp.c index ed0cff5ce82..c0c11bf02d2 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -23519,9 +23519,9 @@ note_mouse_highlight (f, x, y) window = window_from_coordinates (f, x, y, &part, 0, 0, 1); /* If displaying active text in another window, clear that. */ - if (! EQ (window, hlinfo->mouse_face_window) + if (! EQ (window, dpyinfo->mouse_face_window) /* Also clear if we move out of text area in same window. */ - || (!NILP (hlinfo->mouse_face_window) + || (!NILP (dpyinfo->mouse_face_window) && !NILP (window) && part != ON_TEXT && part != ON_MODE_LINE -- cgit v1.2.1 From 1ba94341834d2846ca3bde3e5c1154fb365b7360 Mon Sep 17 00:00:00 2001 From: Johan Bockgård Date: Mon, 9 Jan 2012 17:44:18 +0800 Subject: Avoid crash on composition (backport from trunk). * xdisp.c (fill_composite_glyph_string): Always set s->face, to avoid a crash (bug#9496). --- src/ChangeLog | 5 +++++ src/xdisp.c | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/src/ChangeLog b/src/ChangeLog index fcaff20727d..7cfb3aa61e1 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2011-11-11 Johan Bockgård + + * xdisp.c (fill_composite_glyph_string): Always set s->face, to + avoid a crash (bug#9496). + 2012-01-09 Chong Yidong * xdisp.c (note_mouse_highlight): Fix use of uninitialized var. diff --git a/src/xdisp.c b/src/xdisp.c index c0c11bf02d2..ca61947be8b 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -19635,6 +19635,12 @@ fill_composite_glyph_string (s, base_face, overlaps) } s->cmp_to = i; + if (s->face == NULL) + { + s->face = base_face->ascii_face; + s->font = s->face->font; + } + /* All glyph strings for the same composition has the same width, i.e. the width set for the first component of the composition. */ s->width = s->first_glyph->pixel_width; -- cgit v1.2.1 From ed516deec46c8e45356c066b79c3f77ca8cdb4d0 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Mon, 9 Jan 2012 17:49:08 +0800 Subject: Fix uninitialized variable in note_mouse_highlight (backport from trunk). * xdisp.c (note_mouse_highlight): Initialize `area'. (Bug#9947) --- src/ChangeLog | 6 +++--- src/xdisp.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 7cfb3aa61e1..46d1b292425 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -9,9 +9,9 @@ 2012-01-09 Eli Zaretskii - * xdisp.c (note_mouse_highlight): Initialize `part', to avoid a - possible random value that matches one of those tested as - condition to clear the mouse face. + * xdisp.c (note_mouse_highlight): Initialize `area'. (Bug#9947) + Initialize `part', to avoid a possible random value that matches + one of those tested as condition to clear the mouse face. 2012-01-09 YAMAMOTO Mitsuharu diff --git a/src/xdisp.c b/src/xdisp.c index ca61947be8b..1980ac69c46 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -23580,7 +23580,7 @@ note_mouse_highlight (f, x, y) && XFASTINT (w->last_modified) == BUF_MODIFF (b) && XFASTINT (w->last_overlay_modified) == BUF_OVERLAY_MODIFF (b)) { - int hpos, vpos, pos, i, dx, dy, area; + int hpos, vpos, pos, i, dx, dy, area = LAST_AREA; struct glyph *glyph; Lisp_Object object; Lisp_Object mouse_face = Qnil, overlay = Qnil, position; -- cgit v1.2.1 From 959272ecf045739c52dcf65b1b5a4e591de9e920 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Tue, 10 Jan 2012 00:32:46 -0800 Subject: Update short copyright year to 2012 (do not merge to trunk) * etc/refcards/calccard.tex, etc/refcards/cs-dired-ref.tex: * etc/refcards/cs-refcard.tex, etc/refcards/cs-survival.tex: * etc/refcards/de-refcard.tex, etc/refcards/dired-ref.tex: * etc/refcards/fr-dired-ref.tex, etc/refcards/fr-refcard.tex: * etc/refcards/fr-survival.tex, etc/refcards/orgcard.tex: * etc/refcards/pl-refcard.tex, etc/refcards/pt-br-refcard.tex: * etc/refcards/refcard.tex, etc/refcards/ru-refcard.tex: * etc/refcards/sk-dired-ref.tex, etc/refcards/sk-refcard.tex: * etc/refcards/sk-survival.tex, etc/refcards/survival.tex: * etc/refcards/vipcard.tex, etc/refcards/viperCard.tex: * lib-src/ebrowse.c (version) : * lib-src/etags.c (print_version) : * lib-src/rcs2log (Copyright): * lisp/version.el (emacs-copyright): * nextstep/Cocoa/Emacs.base/Contents/Info.plist: * nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings: * nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist: Update short copyright year to 2012. --- etc/ChangeLog | 14 ++++++++++++++ etc/refcards/calccard.tex | 2 +- etc/refcards/cs-dired-ref.tex | 2 +- etc/refcards/cs-refcard.tex | 2 +- etc/refcards/cs-survival.tex | 2 +- etc/refcards/de-refcard.tex | 2 +- etc/refcards/dired-ref.tex | 2 +- etc/refcards/fr-dired-ref.tex | 2 +- etc/refcards/fr-refcard.tex | 2 +- etc/refcards/fr-survival.tex | 2 +- etc/refcards/orgcard.tex | 2 +- etc/refcards/pl-refcard.tex | 2 +- etc/refcards/pt-br-refcard.tex | 2 +- etc/refcards/refcard.tex | 2 +- etc/refcards/ru-refcard.tex | 2 +- etc/refcards/sk-dired-ref.tex | 2 +- etc/refcards/sk-refcard.tex | 2 +- etc/refcards/sk-survival.tex | 2 +- etc/refcards/survival.tex | 2 +- etc/refcards/vipcard.tex | 2 +- etc/refcards/viperCard.tex | 2 +- lib-src/ChangeLog | 6 ++++++ lib-src/ebrowse.c | 2 +- lib-src/etags.c | 2 +- lib-src/rcs2log | 2 +- lisp/ChangeLog | 4 ++++ lisp/version.el | 4 ++-- nextstep/ChangeLog | 8 ++++++++ nextstep/Cocoa/Emacs.base/Contents/Info.plist | 2 +- .../Contents/Resources/English.lproj/InfoPlist.strings | 2 +- nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist | 2 +- 31 files changed, 60 insertions(+), 28 deletions(-) diff --git a/etc/ChangeLog b/etc/ChangeLog index 6e5bb392cc8..37d3ebeafff 100644 --- a/etc/ChangeLog +++ b/etc/ChangeLog @@ -1,3 +1,17 @@ +2012-01-10 Glenn Morris + + * refcards/calccard.tex, refcards/cs-dired-ref.tex: + * refcards/cs-refcard.tex, refcards/cs-survival.tex: + * refcards/de-refcard.tex, refcards/dired-ref.tex: + * refcards/fr-dired-ref.tex, refcards/fr-refcard.tex: + * refcards/fr-survival.tex, refcards/orgcard.tex: + * refcards/pl-refcard.tex, refcards/pt-br-refcard.tex: + * refcards/refcard.tex, refcards/ru-refcard.tex: + * refcards/sk-dired-ref.tex, refcards/sk-refcard.tex: + * refcards/sk-survival.tex, refcards/survival.tex: + * refcards/vipcard.tex, refcards/viperCard.tex: + Update short copyright year to 2012. + 2011-03-07 Chong Yidong * Version 23.3 released. diff --git a/etc/refcards/calccard.tex b/etc/refcards/calccard.tex index e74cc536151..b68e8b85297 100644 --- a/etc/refcards/calccard.tex +++ b/etc/refcards/calccard.tex @@ -65,7 +65,7 @@ % Internet: gildea@stop.mail-abuse.org \def\emacsversionnumber{23} -\def\year{2011} % latest copyright year +\def\year{2012} % latest copyright year \def\shortcopyrightnotice{\vskip 1ex plus 2 fill \centerline{\small \copyright\ \year\ Free Software Foundation, Inc. diff --git a/etc/refcards/cs-dired-ref.tex b/etc/refcards/cs-dired-ref.tex index bb91fa60023..4f955cf96e3 100644 --- a/etc/refcards/cs-dired-ref.tex +++ b/etc/refcards/cs-dired-ref.tex @@ -43,7 +43,7 @@ \pdflayout=(0) \def\versionemacs{23} % version of Emacs this is for -\def\year{2011} % latest copyright year +\def\year{2012} % latest copyright year % Nothing else needs to be changed. diff --git a/etc/refcards/cs-refcard.tex b/etc/refcards/cs-refcard.tex index 252976d6e86..ba8bd2ba2bd 100644 --- a/etc/refcards/cs-refcard.tex +++ b/etc/refcards/cs-refcard.tex @@ -60,7 +60,7 @@ \pdflayout=(0) \def\versionemacs{23} % version of Emacs this is for -\def\year{2011} % latest copyright year +\def\year{2012} % latest copyright year % Nothing else needs to be changed. diff --git a/etc/refcards/cs-survival.tex b/etc/refcards/cs-survival.tex index b87e561ff3c..c4e303a9f2b 100644 --- a/etc/refcards/cs-survival.tex +++ b/etc/refcards/cs-survival.tex @@ -56,7 +56,7 @@ \chyph \def\versionemacs{23} % version of Emacs this is for -\def\year{2011} % latest copyright year +\def\year{2012} % latest copyright year \def\copyrightnotice{\penalty-1\vfill \vbox{\smallfont\baselineskip=0.8\baselineskip\raggedcenter diff --git a/etc/refcards/de-refcard.tex b/etc/refcards/de-refcard.tex index 9e074b72396..cb485b256cc 100644 --- a/etc/refcards/de-refcard.tex +++ b/etc/refcards/de-refcard.tex @@ -62,7 +62,7 @@ \mdqoff % deactivates the "-char \def\versionemacs{23} % version of Emacs this is for -\def\year{2011} % latest copyright year +\def\year{2012} % latest copyright year % Nothing else needs to be changed below this line. diff --git a/etc/refcards/dired-ref.tex b/etc/refcards/dired-ref.tex index fdb46d5b48f..e04a867f877 100644 --- a/etc/refcards/dired-ref.tex +++ b/etc/refcards/dired-ref.tex @@ -45,7 +45,7 @@ \pdflayout=(1) \def\versionemacs{23} % version of Emacs this is for -\def\year{2011} % latest copyright year +\def\year{2012} % latest copyright year % Nothing else needs to be changed. diff --git a/etc/refcards/fr-dired-ref.tex b/etc/refcards/fr-dired-ref.tex index 549cf341a55..0bd368961a3 100644 --- a/etc/refcards/fr-dired-ref.tex +++ b/etc/refcards/fr-dired-ref.tex @@ -37,7 +37,7 @@ \pdflayout=(0) \def\versionemacs{23} % version of Emacs this is for -\def\year{2011} % latest copyright year +\def\year{2012} % latest copyright year % Nothing else needs to be changed. diff --git a/etc/refcards/fr-refcard.tex b/etc/refcards/fr-refcard.tex index c02169cc677..3da69552830 100644 --- a/etc/refcards/fr-refcard.tex +++ b/etc/refcards/fr-refcard.tex @@ -57,7 +57,7 @@ \pdflayout=(0l) \def\versionemacs{23} % version of Emacs this is for -\def\year{2011} % latest copyright year +\def\year{2012} % latest copyright year % Nothing else needs to be changed below this line. diff --git a/etc/refcards/fr-survival.tex b/etc/refcards/fr-survival.tex index fea6ec27cf6..3565216e8a7 100644 --- a/etc/refcards/fr-survival.tex +++ b/etc/refcards/fr-survival.tex @@ -51,7 +51,7 @@ \pdflayout=(0) \def\versionemacs{23} % version of Emacs this is for -\def\year{2011} % latest copyright year +\def\year{2012} % latest copyright year \def\copyrightnotice{\penalty-1\vfill \vbox{\smallfont\baselineskip=0.8\baselineskip\raggedcenter diff --git a/etc/refcards/orgcard.tex b/etc/refcards/orgcard.tex index 28fb565dc84..18dd5700464 100644 --- a/etc/refcards/orgcard.tex +++ b/etc/refcards/orgcard.tex @@ -1,7 +1,7 @@ % Reference Card for Org Mode \def\orgversionnumber{6.33x} \def\versionyear{2009} % latest update -\def\year{2011} % latest copyright year +\def\year{2012} % latest copyright year %**start of header \newcount\columnsperpage diff --git a/etc/refcards/pl-refcard.tex b/etc/refcards/pl-refcard.tex index 500689aa852..826e624a6c0 100644 --- a/etc/refcards/pl-refcard.tex +++ b/etc/refcards/pl-refcard.tex @@ -71,7 +71,7 @@ \pdflayout=(0) \def\versionemacs{23} % version of Emacs this is for -\def\year{2011} % latest copyright year +\def\year{2012} % latest copyright year % Nothing else needs to be changed. diff --git a/etc/refcards/pt-br-refcard.tex b/etc/refcards/pt-br-refcard.tex index 76c1c37caa2..eaf1dbc5f2f 100644 --- a/etc/refcards/pt-br-refcard.tex +++ b/etc/refcards/pt-br-refcard.tex @@ -63,7 +63,7 @@ \pdflayout=(0l) \def\versionemacs{23} % version of Emacs this is for -\def\year{2011} % latest copyright year +\def\year{2012} % latest copyright year % Nothing else needs to be changed below this line. diff --git a/etc/refcards/refcard.tex b/etc/refcards/refcard.tex index 1c56bef2fc7..1849411db70 100644 --- a/etc/refcards/refcard.tex +++ b/etc/refcards/refcard.tex @@ -64,7 +64,7 @@ % Nothing else needs to be changed below this line. \def\versionemacs{23} % version of Emacs this is for -\def\year{2011} % copyright year +\def\year{2012} % copyright year \def\shortcopyrightnotice{\vskip 1ex plus 2 fill \centerline{\small \copyright\ \year\ Free Software Foundation, Inc. diff --git a/etc/refcards/ru-refcard.tex b/etc/refcards/ru-refcard.tex index 6030dbb17b6..274bafcf7ad 100644 --- a/etc/refcards/ru-refcard.tex +++ b/etc/refcards/ru-refcard.tex @@ -23,7 +23,7 @@ \setlength{\ColThreeWidth}{25mm} \newcommand{\versionemacs}[0]{23} % version of Emacs this is for -\newcommand{\cyear}[0]{2011} % copyright year +\newcommand{\cyear}[0]{2012} % copyright year \newcommand\shortcopyrightnotice[0]{\vskip 1ex plus 2 fill \centerline{\footnotesize \copyright\ \cyear\ Free Software Foundation, Inc. diff --git a/etc/refcards/sk-dired-ref.tex b/etc/refcards/sk-dired-ref.tex index 4a2b707403f..6604b5c6120 100644 --- a/etc/refcards/sk-dired-ref.tex +++ b/etc/refcards/sk-dired-ref.tex @@ -44,7 +44,7 @@ \pdflayout=(0) \def\versionemacs{23} % version of Emacs this is for -\def\year{2011} % latest copyright year +\def\year{2012} % latest copyright year % Nothing else needs to be changed. diff --git a/etc/refcards/sk-refcard.tex b/etc/refcards/sk-refcard.tex index 534216734c6..9ed211f959c 100644 --- a/etc/refcards/sk-refcard.tex +++ b/etc/refcards/sk-refcard.tex @@ -61,7 +61,7 @@ \pdflayout=(0) \def\versionemacs{23} % version of Emacs this is for -\def\year{2010} % latest copyright year +\def\year{2012} % latest copyright year % Nothing else needs to be changed. diff --git a/etc/refcards/sk-survival.tex b/etc/refcards/sk-survival.tex index b59ba833b94..031ab548485 100644 --- a/etc/refcards/sk-survival.tex +++ b/etc/refcards/sk-survival.tex @@ -57,7 +57,7 @@ \shyph \def\versionemacs{23} % version of Emacs this is for -\def\year{2011} % latest copyright year +\def\year{2012} % latest copyright year \def\copyrightnotice{\penalty-1\vfill \vbox{\smallfont\baselineskip=0.8\baselineskip\raggedcenter diff --git a/etc/refcards/survival.tex b/etc/refcards/survival.tex index 2d2bff576f2..6642f077c11 100644 --- a/etc/refcards/survival.tex +++ b/etc/refcards/survival.tex @@ -46,7 +46,7 @@ \pdflayout=(1) \def\versionemacs{23} % version of Emacs this is for -\def\year{2011} % latest copyright year +\def\year{2012} % latest copyright year \def\copyrightnotice{\penalty-1\vfill \vbox{\smallfont\baselineskip=0.8\baselineskip\raggedcenter diff --git a/etc/refcards/vipcard.tex b/etc/refcards/vipcard.tex index bd3beb71d35..9970eacbd7d 100644 --- a/etc/refcards/vipcard.tex +++ b/etc/refcards/vipcard.tex @@ -51,7 +51,7 @@ \pdflayout=(1) \def\versionemacs{18} % version of Emacs this is for -\def\year{2011} % latest copyright year +\def\year{2012} % latest copyright year \def\versionvip{3.5} % Nothing else needs to be changed. diff --git a/etc/refcards/viperCard.tex b/etc/refcards/viperCard.tex index d403d9d2615..d500a5e37df 100644 --- a/etc/refcards/viperCard.tex +++ b/etc/refcards/viperCard.tex @@ -54,7 +54,7 @@ \pdflayout=(1) \def\versionemacs{21} % version of Emacs this is for -\def\year{2011} % latest copyright year +\def\year{2012} % latest copyright year \def\versionxemacs{20} % version of XEmacs this is for \def\versionviper{3.0} % version of Viper this is for diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index 73a63eeaec4..73a447bc3a1 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,3 +1,9 @@ +2012-01-10 Glenn Morris + + * ebrowse.c (version) : + * etags.c (print_version) : + * rcs2log (Copyright): Update short copyright year to 2012. + 2011-03-07 Chong Yidong * Version 23.3 released. diff --git a/lib-src/ebrowse.c b/lib-src/ebrowse.c index 735cf30ae2e..ce71264333b 100644 --- a/lib-src/ebrowse.c +++ b/lib-src/ebrowse.c @@ -3685,7 +3685,7 @@ void version () { /* Makes it easier to update automatically. */ - char emacs_copyright[] = "Copyright (C) 2011 Free Software Foundation, Inc."; + char emacs_copyright[] = "Copyright (C) 2012 Free Software Foundation, Inc."; printf ("ebrowse %s\n", VERSION); puts (emacs_copyright); diff --git a/lib-src/etags.c b/lib-src/etags.c index da43b89e40a..c3209a92dd6 100644 --- a/lib-src/etags.c +++ b/lib-src/etags.c @@ -898,7 +898,7 @@ static void print_version () { /* Makes it easier to update automatically. */ - char emacs_copyright[] = "Copyright (C) 2011 Free Software Foundation, Inc."; + char emacs_copyright[] = "Copyright (C) 2012 Free Software Foundation, Inc."; printf ("%s (%s %s)\n", (CTAGS) ? "ctags" : "etags", EMACS_NAME, VERSION); puts (emacs_copyright); diff --git a/lib-src/rcs2log b/lib-src/rcs2log index 5808068f646..ffc7b547559 100755 --- a/lib-src/rcs2log +++ b/lib-src/rcs2log @@ -22,7 +22,7 @@ # along with this program. If not, see . -Copyright='Copyright (C) 2011 Free Software Foundation, Inc. +Copyright='Copyright (C) 2012 Free Software Foundation, Inc. This program comes with NO WARRANTY, to the extent permitted by law. You may redistribute copies of this program under the terms of the GNU General Public License. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index f579b7179d4..6b96ed60dd0 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2012-01-10 Glenn Morris + + * version.el (emacs-copyright): Update year to 2012. + 2011-08-21 Deniz Dogan * iswitchb.el (iswitchb-window-buffer-p): Use `member' instead of diff --git a/lisp/version.el b/lisp/version.el index 424c681c083..14b447eda2e 100644 --- a/lisp/version.el +++ b/lisp/version.el @@ -1,7 +1,7 @@ ;;; version.el --- record version number of Emacs -*- no-byte-compile: t -*- ;; Copyright (C) 1985, 1992, 1994, 1995, 1999, 2000, 2001, 2002, 2003, -;; 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +;; 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 ;; Free Software Foundation, Inc. ;; Maintainer: FSF @@ -29,7 +29,7 @@ ;;; Code: -(defconst emacs-copyright "Copyright (C) 2011 Free Software Foundation, Inc." "\ +(defconst emacs-copyright "Copyright (C) 2012 Free Software Foundation, Inc." "\ Short copyright string for this version of Emacs.") (defconst emacs-version "23.3.50" "\ diff --git a/nextstep/ChangeLog b/nextstep/ChangeLog index c0a08f844ba..7d05195e24f 100644 --- a/nextstep/ChangeLog +++ b/nextstep/ChangeLog @@ -1,3 +1,10 @@ +2012-01-10 Glenn Morris + + * Cocoa/Emacs.base/Contents/Info.plist: + * Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings: + * GNUstep/Emacs.base/Resources/Info-gnustep.plist: + Update short copyright year to 2012. + 2011-03-07 Chong Yidong * Version 23.3 released. @@ -7,6 +14,7 @@ * Cocoa/Emacs.base/Contents/Info.plist: * Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings: * GNUstep/Emacs.base/Resources/Info-gnustep.plist: + Update short copyright year to 2011. 2010-05-07 Chong Yidong diff --git a/nextstep/Cocoa/Emacs.base/Contents/Info.plist b/nextstep/Cocoa/Emacs.base/Contents/Info.plist index 14a543bc278..1e77b29eeb5 100644 --- a/nextstep/Cocoa/Emacs.base/Contents/Info.plist +++ b/nextstep/Cocoa/Emacs.base/Contents/Info.plist @@ -553,7 +553,7 @@ along with GNU Emacs. If not, see . CFBundleExecutable Emacs CFBundleGetInfoString - Emacs 23.3.50 Copyright (C) 2011 Free Software Foundation, Inc. + Emacs 23.3.50 Copyright (C) 2012 Free Software Foundation, Inc. CFBundleIconFile Emacs.icns CFBundleIdentifier diff --git a/nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings b/nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings index fe99acec153..154f7d40411 100644 --- a/nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings +++ b/nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings @@ -3,4 +3,4 @@ CFBundleName = "Emacs"; CFBundleShortVersionString = "Version 23.3.50"; CFBundleGetInfoString = "Emacs version 23.3.50, NS Windowing"; -NSHumanReadableCopyright = "Copyright (C) 2011 Free Software Foundation, Inc."; +NSHumanReadableCopyright = "Copyright (C) 2012 Free Software Foundation, Inc."; diff --git a/nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist b/nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist index b72854f7600..caef8666512 100644 --- a/nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist +++ b/nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist @@ -11,7 +11,7 @@ "Carl Edman (NeXTStep)", "..see http://emacs-app.sf.net/authorship.html" ); - Copyright = "Copyright (C) 2011 Free Software Foundation, Inc."; + Copyright = "Copyright (C) 2012 Free Software Foundation, Inc."; CopyrightDescription = "Released under the GNU General Public License Version 3 or later"; FullVersionID = "Emacs 23.3.50, NS Windowing"; NSExecutable = Emacs; -- cgit v1.2.1 From 49f70d46ea38ceb7a501594db7f6ea35e19681aa Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Tue, 10 Jan 2012 23:52:35 -0800 Subject: Add 2012 to FSF copyright years for Emacs files (do not merge to trunk) --- ChangeLog | 2 +- INSTALL | 2 +- INSTALL.BZR | 2 +- Makefile.in | 2 +- README | 2 +- admin/ChangeLog | 2 +- admin/README | 2 +- admin/admin.el | 2 +- admin/alloc-colors.c | 2 +- admin/build-configs | 2 +- admin/charsets/mapfiles/README | 2 +- admin/cus-test.el | 2 +- admin/diff-tar-files | 2 +- admin/make-announcement | 2 +- admin/make-emacs | 2 +- admin/notes/copyright | 2 +- admin/notes/font-backend | 2 +- admin/notes/lel-TODO | 2 +- admin/notes/multi-tty | 2 +- admin/notes/unicode | 2 +- admin/nt/README-UNDUMP.W32 | 2 +- admin/nt/README-ftp-server | 2 +- admin/nt/README.W32 | 2 +- admin/nt/makedist.bat | 2 +- admin/quick-install-emacs | 2 +- config.bat | 2 +- configure.in | 4 ++-- doc/emacs/ChangeLog | 2 +- doc/emacs/Makefile.in | 2 +- doc/emacs/abbrevs.texi | 2 +- doc/emacs/ack.texi | 2 +- doc/emacs/anti.texi | 2 +- doc/emacs/arevert-xtra.texi | 2 +- doc/emacs/basic.texi | 2 +- doc/emacs/buffers.texi | 2 +- doc/emacs/building.texi | 2 +- doc/emacs/cal-xtra.texi | 2 +- doc/emacs/calendar.texi | 2 +- doc/emacs/cmdargs.texi | 2 +- doc/emacs/commands.texi | 2 +- doc/emacs/custom.texi | 2 +- doc/emacs/dired-xtra.texi | 2 +- doc/emacs/dired.texi | 2 +- doc/emacs/display.texi | 2 +- doc/emacs/emacs-xtra.texi | 2 +- doc/emacs/emacs.texi | 2 +- doc/emacs/emerge-xtra.texi | 2 +- doc/emacs/entering.texi | 2 +- doc/emacs/files.texi | 2 +- doc/emacs/fixit.texi | 2 +- doc/emacs/fortran-xtra.texi | 2 +- doc/emacs/frames.texi | 2 +- doc/emacs/glossary.texi | 2 +- doc/emacs/gnu.texi | 2 +- doc/emacs/help.texi | 2 +- doc/emacs/indent.texi | 2 +- doc/emacs/killing.texi | 2 +- doc/emacs/kmacro.texi | 2 +- doc/emacs/m-x.texi | 2 +- doc/emacs/macos.texi | 2 +- doc/emacs/maintaining.texi | 2 +- doc/emacs/major.texi | 2 +- doc/emacs/makefile.w32-in | 2 +- doc/emacs/mark.texi | 2 +- doc/emacs/mini.texi | 2 +- doc/emacs/misc.texi | 2 +- doc/emacs/msdog-xtra.texi | 2 +- doc/emacs/msdog.texi | 2 +- doc/emacs/mule.texi | 2 +- doc/emacs/picture-xtra.texi | 2 +- doc/emacs/programs.texi | 2 +- doc/emacs/regs.texi | 2 +- doc/emacs/rmail.texi | 2 +- doc/emacs/screen.texi | 2 +- doc/emacs/search.texi | 2 +- doc/emacs/sending.texi | 2 +- doc/emacs/text.texi | 2 +- doc/emacs/trouble.texi | 2 +- doc/emacs/vc-xtra.texi | 2 +- doc/emacs/vc1-xtra.texi | 2 +- doc/emacs/windows.texi | 2 +- doc/emacs/xresources.texi | 2 +- doc/lispintro/ChangeLog | 2 +- doc/lispintro/Makefile.in | 2 +- doc/lispintro/README | 2 +- doc/lispintro/cons-1.eps | 2 +- doc/lispintro/cons-2.eps | 2 +- doc/lispintro/cons-2a.eps | 2 +- doc/lispintro/cons-3.eps | 2 +- doc/lispintro/cons-4.eps | 2 +- doc/lispintro/cons-5.eps | 2 +- doc/lispintro/drawers.eps | 2 +- doc/lispintro/emacs-lisp-intro.texi | 2 +- doc/lispintro/lambda-1.eps | 2 +- doc/lispintro/lambda-2.eps | 2 +- doc/lispintro/lambda-3.eps | 2 +- doc/lispintro/makefile.w32-in | 2 +- doc/lispref/ChangeLog | 2 +- doc/lispref/Makefile.in | 2 +- doc/lispref/README | 2 +- doc/lispref/abbrevs.texi | 2 +- doc/lispref/advice.texi | 2 +- doc/lispref/anti.texi | 2 +- doc/lispref/back.texi | 2 +- doc/lispref/backups.texi | 2 +- doc/lispref/buffers.texi | 2 +- doc/lispref/commands.texi | 2 +- doc/lispref/compile.texi | 2 +- doc/lispref/control.texi | 2 +- doc/lispref/customize.texi | 2 +- doc/lispref/debugging.texi | 2 +- doc/lispref/display.texi | 2 +- doc/lispref/edebug.texi | 2 +- doc/lispref/elisp-covers.texi | 2 +- doc/lispref/elisp.texi | 2 +- doc/lispref/errors.texi | 2 +- doc/lispref/eval.texi | 2 +- doc/lispref/files.texi | 2 +- doc/lispref/frames.texi | 2 +- doc/lispref/functions.texi | 2 +- doc/lispref/hash.texi | 2 +- doc/lispref/help.texi | 2 +- doc/lispref/hooks.texi | 2 +- doc/lispref/internals.texi | 2 +- doc/lispref/intro.texi | 2 +- doc/lispref/keymaps.texi | 2 +- doc/lispref/lay-flat.texi | 2 +- doc/lispref/lists.texi | 2 +- doc/lispref/loading.texi | 2 +- doc/lispref/locals.texi | 2 +- doc/lispref/macros.texi | 2 +- doc/lispref/makefile.w32-in | 2 +- doc/lispref/maps.texi | 2 +- doc/lispref/markers.texi | 2 +- doc/lispref/minibuf.texi | 2 +- doc/lispref/modes.texi | 2 +- doc/lispref/nonascii.texi | 2 +- doc/lispref/numbers.texi | 2 +- doc/lispref/objects.texi | 2 +- doc/lispref/os.texi | 2 +- doc/lispref/positions.texi | 2 +- doc/lispref/processes.texi | 2 +- doc/lispref/searching.texi | 2 +- doc/lispref/sequences.texi | 2 +- doc/lispref/streams.texi | 2 +- doc/lispref/strings.texi | 2 +- doc/lispref/symbols.texi | 2 +- doc/lispref/syntax.texi | 2 +- doc/lispref/text.texi | 2 +- doc/lispref/tindex.pl | 2 +- doc/lispref/tips.texi | 2 +- doc/lispref/two-volume-cross-refs.txt | 2 +- doc/lispref/two-volume.make | 2 +- doc/lispref/two.el | 2 +- doc/lispref/variables.texi | 2 +- doc/lispref/vol1.texi | 4 ++-- doc/lispref/vol2.texi | 4 ++-- doc/lispref/windows.texi | 2 +- doc/man/ChangeLog | 2 +- doc/man/b2m.1 | 2 +- doc/man/ebrowse.1 | 2 +- doc/man/emacs.1 | 2 +- doc/man/grep-changelog.1 | 2 +- doc/man/rcs-checkin.1 | 2 +- doc/misc/ChangeLog | 2 +- doc/misc/Makefile.in | 2 +- doc/misc/ada-mode.texi | 2 +- doc/misc/auth.texi | 2 +- doc/misc/autotype.texi | 2 +- doc/misc/calc.texi | 2 +- doc/misc/cc-mode.texi | 2 +- doc/misc/cl.texi | 2 +- doc/misc/dbus.texi | 2 +- doc/misc/dired-x.texi | 2 +- doc/misc/ebrowse.texi | 2 +- doc/misc/ede.texi | 2 +- doc/misc/ediff.texi | 2 +- doc/misc/edt.texi | 2 +- doc/misc/eieio.texi | 2 +- doc/misc/emacs-mime.texi | 2 +- doc/misc/epa.texi | 2 +- doc/misc/erc.texi | 2 +- doc/misc/eshell.texi | 2 +- doc/misc/eudc.texi | 2 +- doc/misc/faq.texi | 2 +- doc/misc/flymake.texi | 2 +- doc/misc/forms.texi | 2 +- doc/misc/gnus-coding.texi | 2 +- doc/misc/gnus-faq.texi | 2 +- doc/misc/gnus-news.el | 4 ++-- doc/misc/gnus-news.texi | 2 +- doc/misc/gnus.texi | 2 +- doc/misc/idlwave.texi | 2 +- doc/misc/info.texi | 2 +- doc/misc/mairix-el.texi | 2 +- doc/misc/makefile.w32-in | 2 +- doc/misc/message.texi | 2 +- doc/misc/mh-e.texi | 2 +- doc/misc/newsticker.texi | 2 +- doc/misc/nxml-mode.texi | 2 +- doc/misc/org.texi | 3 ++- doc/misc/pcl-cvs.texi | 2 +- doc/misc/pgg.texi | 2 +- doc/misc/rcirc.texi | 2 +- doc/misc/reftex.texi | 2 +- doc/misc/remember.texi | 2 +- doc/misc/sasl.texi | 2 +- doc/misc/sc.texi | 2 +- doc/misc/sem-user.texi | 2 +- doc/misc/semantic.texi | 2 +- doc/misc/ses.texi | 2 +- doc/misc/sieve.texi | 2 +- doc/misc/smtpmail.texi | 2 +- doc/misc/speedbar.texi | 2 +- doc/misc/tramp.texi | 2 +- doc/misc/trampver.texi | 2 +- doc/misc/url.texi | 2 +- doc/misc/vip.texi | 2 +- doc/misc/viper.texi | 2 +- doc/misc/widget.texi | 2 +- doc/misc/woman.texi | 2 +- etc/CONTRIBUTE | 2 +- etc/ChangeLog | 2 +- etc/DEBUG | 2 +- etc/DISTRIB | 2 +- etc/ERC-NEWS | 2 +- etc/ETAGS.EBNF | 2 +- etc/ETAGS.README | 2 +- etc/GNU | 2 +- etc/GNUS-NEWS | 2 +- etc/HELLO | 2 +- etc/MACHINES | 2 +- etc/MAILINGLISTS | 2 +- etc/MH-E-NEWS | 2 +- etc/MORE.STUFF | 2 +- etc/NEWS | 2 +- etc/NEWS.1-17 | 2 +- etc/NEWS.18 | 2 +- etc/NEWS.19 | 2 +- etc/NEWS.20 | 2 +- etc/NEWS.21 | 2 +- etc/NEWS.22 | 2 +- etc/PROBLEMS | 2 +- etc/README | 2 +- etc/TERMS | 2 +- etc/TODO | 2 +- etc/charsets/README | 4 ++-- etc/compilation.txt | 2 +- etc/edt-user.el | 2 +- etc/emacs-buffer.gdb | 2 +- etc/emacs.bash | 2 +- etc/emacs2.py | 2 +- etc/emacs3.py | 2 +- etc/enriched.doc | 2 +- etc/gnus-tut.txt | 2 +- etc/grammars/bovine-grammar.el | 2 +- etc/grammars/c.by | 2 +- etc/grammars/grammar.wy | 2 +- etc/grammars/java-tags.wy | 2 +- etc/grammars/js.wy | 4 ++-- etc/grammars/make.by | 2 +- etc/grammars/python.wy | 2 +- etc/grammars/scheme.by | 2 +- etc/grammars/srecode-template.wy | 2 +- etc/grammars/wisent-grammar.el | 4 ++-- etc/grep.txt | 2 +- etc/images/README | 6 +++--- etc/images/custom/README | 2 +- etc/images/ezimage/README | 2 +- etc/images/gnus/README | 6 +++--- etc/images/gnus/gnus.svg | 2 +- etc/images/gud/README | 6 +++--- etc/images/icons/README | 4 ++-- etc/images/icons/hicolor/scalable/apps/emacs.svg | 2 +- etc/images/icons/hicolor/scalable/mimetypes/emacs-document.svg | 2 +- etc/images/mh-logo.xpm | 2 +- etc/images/mpc/README | 2 +- etc/images/smilies/README | 2 +- etc/images/smilies/grayscale/README | 2 +- etc/images/smilies/medium/README | 2 +- etc/images/splash.svg | 2 +- etc/images/splash.xpm | 2 +- etc/images/tree-widget/default/README | 2 +- etc/images/tree-widget/folder/README | 2 +- etc/ps-prin0.ps | 2 +- etc/ps-prin1.ps | 2 +- etc/refcards/Makefile | 2 +- etc/refcards/README | 2 +- etc/refcards/calccard.tex | 2 +- etc/refcards/cs-dired-ref.tex | 2 +- etc/refcards/cs-refcard.tex | 2 +- etc/refcards/cs-survival.tex | 2 +- etc/refcards/de-refcard.tex | 2 +- etc/refcards/dired-ref.tex | 2 +- etc/refcards/fr-dired-ref.tex | 2 +- etc/refcards/fr-refcard.tex | 2 +- etc/refcards/fr-survival.tex | 2 +- etc/refcards/gnus-logo.eps | 2 +- etc/refcards/gnus-refcard.tex | 2 +- etc/refcards/orgcard.tex | 2 +- etc/refcards/pdflayout.sty | 2 +- etc/refcards/pl-refcard.tex | 2 +- etc/refcards/pt-br-refcard.tex | 2 +- etc/refcards/refcard.tex | 2 +- etc/refcards/ru-refcard.tex | 2 +- etc/refcards/sk-dired-ref.tex | 2 +- etc/refcards/sk-refcard.tex | 2 +- etc/refcards/sk-survival.tex | 2 +- etc/refcards/survival.tex | 2 +- etc/refcards/vipcard.tex | 2 +- etc/refcards/viperCard.tex | 2 +- etc/schema/locate.rnc | 2 +- etc/schema/relaxng.rnc | 2 +- etc/schema/schemas.xml | 2 +- etc/ses-example.ses | 2 +- etc/srecode/cpp.srt | 2 +- etc/srecode/default.srt | 2 +- etc/srecode/doc-cpp.srt | 2 +- etc/srecode/doc-default.srt | 2 +- etc/srecode/doc-java.srt | 2 +- etc/srecode/ede-make.srt | 2 +- etc/srecode/el.srt | 2 +- etc/srecode/getset-cpp.srt | 2 +- etc/srecode/java.srt | 2 +- etc/srecode/make.srt | 2 +- etc/srecode/template.srt | 2 +- etc/srecode/test.srt | 2 +- etc/srecode/texi.srt | 2 +- etc/srecode/wisent.srt | 2 +- etc/tutorials/TUTORIAL | 2 +- etc/tutorials/TUTORIAL.bg | 2 +- etc/tutorials/TUTORIAL.cn | 4 ++-- etc/tutorials/TUTORIAL.cs | 2 +- etc/tutorials/TUTORIAL.de | 2 +- etc/tutorials/TUTORIAL.eo | 2 +- etc/tutorials/TUTORIAL.es | 2 +- etc/tutorials/TUTORIAL.fr | 2 +- etc/tutorials/TUTORIAL.it | 2 +- etc/tutorials/TUTORIAL.ja | 2 +- etc/tutorials/TUTORIAL.ko | 2 +- etc/tutorials/TUTORIAL.nl | 4 ++-- etc/tutorials/TUTORIAL.pl | 2 +- etc/tutorials/TUTORIAL.pt_BR | 2 +- etc/tutorials/TUTORIAL.ro | 2 +- etc/tutorials/TUTORIAL.ru | 2 +- etc/tutorials/TUTORIAL.sk | 2 +- etc/tutorials/TUTORIAL.sl | 2 +- etc/tutorials/TUTORIAL.sv | 2 +- etc/tutorials/TUTORIAL.th | 2 +- etc/tutorials/TUTORIAL.zh | 2 +- leim/ChangeLog | 2 +- leim/Makefile.in | 2 +- leim/README | 2 +- leim/leim-ext.el | 2 +- leim/makefile.w32-in | 2 +- leim/quail/arabic.el | 2 +- leim/quail/croatian.el | 2 +- leim/quail/cyril-jis.el | 2 +- leim/quail/cyrillic.el | 2 +- leim/quail/czech.el | 2 +- leim/quail/georgian.el | 2 +- leim/quail/greek.el | 2 +- leim/quail/hangul.el | 2 +- leim/quail/hanja.el | 2 +- leim/quail/hanja3.el | 2 +- leim/quail/indian.el | 2 +- leim/quail/ipa.el | 2 +- leim/quail/japanese.el | 2 +- leim/quail/latin-alt.el | 2 +- leim/quail/latin-ltx.el | 2 +- leim/quail/latin-post.el | 2 +- leim/quail/latin-pre.el | 2 +- leim/quail/lrt.el | 2 +- leim/quail/py-punct.el | 2 +- leim/quail/rfc1345.el | 2 +- leim/quail/sgml-input.el | 2 +- leim/quail/sisheng.el | 2 +- leim/quail/slovak.el | 2 +- leim/quail/symbol-ksc.el | 2 +- leim/quail/tibetan.el | 2 +- leim/quail/uni-input.el | 2 +- leim/quail/vntelex.el | 2 +- leim/quail/welsh.el | 2 +- lib-src/ChangeLog | 2 +- lib-src/Makefile.in | 2 +- lib-src/b2m.pl | 2 +- lib-src/digest-doc.c | 2 +- lib-src/ebrowse.c | 2 +- lib-src/emacsclient.c | 2 +- lib-src/etags.c | 2 +- lib-src/fakemail.c | 2 +- lib-src/grep-changelog | 2 +- lib-src/hexl.c | 2 +- lib-src/make-docfile.c | 2 +- lib-src/makefile.w32-in | 2 +- lib-src/movemail.c | 2 +- lib-src/ntlib.c | 2 +- lib-src/ntlib.h | 2 +- lib-src/pop.c | 2 +- lib-src/pop.h | 2 +- lib-src/profile.c | 2 +- lib-src/rcs-checkin | 2 +- lib-src/rcs2log | 2 +- lib-src/sorted-doc.c | 2 +- lib-src/test-distrib.c | 2 +- lib-src/update-game-score.c | 2 +- lib-src/vcdiff | 2 +- lisp/ChangeLog | 2 +- lisp/ChangeLog.1 | 2 +- lisp/ChangeLog.10 | 2 +- lisp/ChangeLog.11 | 2 +- lisp/ChangeLog.12 | 2 +- lisp/ChangeLog.13 | 2 +- lisp/ChangeLog.14 | 2 +- lisp/ChangeLog.2 | 2 +- lisp/ChangeLog.3 | 2 +- lisp/ChangeLog.4 | 2 +- lisp/ChangeLog.5 | 2 +- lisp/ChangeLog.6 | 2 +- lisp/ChangeLog.7 | 2 +- lisp/ChangeLog.8 | 2 +- lisp/ChangeLog.9 | 2 +- lisp/Makefile.in | 2 +- lisp/abbrev.el | 2 +- lisp/abbrevlist.el | 2 +- lisp/add-log.el | 2 +- lisp/align.el | 2 +- lisp/allout.el | 2 +- lisp/ansi-color.el | 2 +- lisp/apropos.el | 2 +- lisp/arc-mode.el | 2 +- lisp/array.el | 2 +- lisp/autoarg.el | 2 +- lisp/autoinsert.el | 2 +- lisp/autorevert.el | 2 +- lisp/avoid.el | 2 +- lisp/battery.el | 2 +- lisp/bindings.el | 2 +- lisp/bookmark.el | 2 +- lisp/bs.el | 2 +- lisp/buff-menu.el | 2 +- lisp/button.el | 2 +- lisp/calc/README | 4 ++-- lisp/calc/README.prev | 2 +- lisp/calc/calc-aent.el | 2 +- lisp/calc/calc-alg.el | 2 +- lisp/calc/calc-arith.el | 2 +- lisp/calc/calc-bin.el | 2 +- lisp/calc/calc-comb.el | 2 +- lisp/calc/calc-cplx.el | 2 +- lisp/calc/calc-embed.el | 2 +- lisp/calc/calc-ext.el | 2 +- lisp/calc/calc-fin.el | 2 +- lisp/calc/calc-forms.el | 2 +- lisp/calc/calc-frac.el | 2 +- lisp/calc/calc-funcs.el | 2 +- lisp/calc/calc-graph.el | 2 +- lisp/calc/calc-help.el | 2 +- lisp/calc/calc-incom.el | 2 +- lisp/calc/calc-keypd.el | 2 +- lisp/calc/calc-lang.el | 2 +- lisp/calc/calc-macs.el | 2 +- lisp/calc/calc-map.el | 2 +- lisp/calc/calc-math.el | 2 +- lisp/calc/calc-menu.el | 2 +- lisp/calc/calc-misc.el | 2 +- lisp/calc/calc-mode.el | 2 +- lisp/calc/calc-mtx.el | 2 +- lisp/calc/calc-nlfit.el | 2 +- lisp/calc/calc-poly.el | 2 +- lisp/calc/calc-prog.el | 2 +- lisp/calc/calc-rewr.el | 2 +- lisp/calc/calc-rules.el | 2 +- lisp/calc/calc-sel.el | 2 +- lisp/calc/calc-stat.el | 2 +- lisp/calc/calc-store.el | 2 +- lisp/calc/calc-stuff.el | 2 +- lisp/calc/calc-trail.el | 2 +- lisp/calc/calc-undo.el | 2 +- lisp/calc/calc-units.el | 2 +- lisp/calc/calc-vec.el | 2 +- lisp/calc/calc-yank.el | 2 +- lisp/calc/calc.el | 2 +- lisp/calc/calcalg2.el | 2 +- lisp/calc/calcalg3.el | 2 +- lisp/calc/calccomp.el | 2 +- lisp/calc/calcsel2.el | 2 +- lisp/calculator.el | 2 +- lisp/calendar/appt.el | 2 +- lisp/calendar/cal-bahai.el | 2 +- lisp/calendar/cal-china.el | 2 +- lisp/calendar/cal-coptic.el | 2 +- lisp/calendar/cal-dst.el | 2 +- lisp/calendar/cal-french.el | 2 +- lisp/calendar/cal-hebrew.el | 2 +- lisp/calendar/cal-html.el | 2 +- lisp/calendar/cal-islam.el | 2 +- lisp/calendar/cal-iso.el | 2 +- lisp/calendar/cal-julian.el | 2 +- lisp/calendar/cal-mayan.el | 2 +- lisp/calendar/cal-menu.el | 2 +- lisp/calendar/cal-move.el | 2 +- lisp/calendar/cal-persia.el | 2 +- lisp/calendar/cal-tex.el | 2 +- lisp/calendar/cal-x.el | 2 +- lisp/calendar/calendar.el | 2 +- lisp/calendar/diary-lib.el | 2 +- lisp/calendar/holidays.el | 2 +- lisp/calendar/icalendar.el | 2 +- lisp/calendar/lunar.el | 2 +- lisp/calendar/parse-time.el | 2 +- lisp/calendar/solar.el | 2 +- lisp/calendar/time-date.el | 2 +- lisp/calendar/timeclock.el | 2 +- lisp/calendar/todo-mode.el | 2 +- lisp/case-table.el | 2 +- lisp/cdl.el | 2 +- lisp/cedet/ChangeLog | 2 +- lisp/cedet/cedet-cscope.el | 2 +- lisp/cedet/cedet-files.el | 2 +- lisp/cedet/cedet-global.el | 2 +- lisp/cedet/cedet-idutils.el | 2 +- lisp/cedet/cedet.el | 2 +- lisp/cedet/data-debug.el | 2 +- lisp/cedet/ede.el | 2 +- lisp/cedet/ede/auto.el | 2 +- lisp/cedet/ede/autoconf-edit.el | 2 +- lisp/cedet/ede/base.el | 2 +- lisp/cedet/ede/cpp-root.el | 2 +- lisp/cedet/ede/custom.el | 2 +- lisp/cedet/ede/dired.el | 2 +- lisp/cedet/ede/emacs.el | 2 +- lisp/cedet/ede/files.el | 2 +- lisp/cedet/ede/generic.el | 2 +- lisp/cedet/ede/linux.el | 2 +- lisp/cedet/ede/locate.el | 2 +- lisp/cedet/ede/make.el | 2 +- lisp/cedet/ede/makefile-edit.el | 2 +- lisp/cedet/ede/pconf.el | 2 +- lisp/cedet/ede/pmake.el | 2 +- lisp/cedet/ede/proj-archive.el | 2 +- lisp/cedet/ede/proj-aux.el | 2 +- lisp/cedet/ede/proj-comp.el | 2 +- lisp/cedet/ede/proj-elisp.el | 2 +- lisp/cedet/ede/proj-info.el | 2 +- lisp/cedet/ede/proj-misc.el | 2 +- lisp/cedet/ede/proj-obj.el | 2 +- lisp/cedet/ede/proj-prog.el | 2 +- lisp/cedet/ede/proj-scheme.el | 2 +- lisp/cedet/ede/proj-shared.el | 2 +- lisp/cedet/ede/proj.el | 2 +- lisp/cedet/ede/project-am.el | 2 +- lisp/cedet/ede/shell.el | 2 +- lisp/cedet/ede/simple.el | 2 +- lisp/cedet/ede/source.el | 2 +- lisp/cedet/ede/speedbar.el | 2 +- lisp/cedet/ede/srecode.el | 2 +- lisp/cedet/ede/system.el | 2 +- lisp/cedet/ede/util.el | 2 +- lisp/cedet/inversion.el | 2 +- lisp/cedet/mode-local.el | 2 +- lisp/cedet/pulse.el | 2 +- lisp/cedet/semantic.el | 2 +- lisp/cedet/semantic/analyze.el | 2 +- lisp/cedet/semantic/analyze/complete.el | 2 +- lisp/cedet/semantic/analyze/debug.el | 2 +- lisp/cedet/semantic/analyze/fcn.el | 2 +- lisp/cedet/semantic/analyze/refs.el | 2 +- lisp/cedet/semantic/bovine.el | 2 +- lisp/cedet/semantic/bovine/c-by.el | 2 +- lisp/cedet/semantic/bovine/c.el | 2 +- lisp/cedet/semantic/bovine/debug.el | 2 +- lisp/cedet/semantic/bovine/el.el | 2 +- lisp/cedet/semantic/bovine/gcc.el | 2 +- lisp/cedet/semantic/bovine/make-by.el | 2 +- lisp/cedet/semantic/bovine/make.el | 2 +- lisp/cedet/semantic/bovine/scm-by.el | 2 +- lisp/cedet/semantic/bovine/scm.el | 2 +- lisp/cedet/semantic/chart.el | 2 +- lisp/cedet/semantic/complete.el | 2 +- lisp/cedet/semantic/ctxt.el | 2 +- lisp/cedet/semantic/db-debug.el | 2 +- lisp/cedet/semantic/db-ebrowse.el | 2 +- lisp/cedet/semantic/db-el.el | 2 +- lisp/cedet/semantic/db-file.el | 2 +- lisp/cedet/semantic/db-find.el | 2 +- lisp/cedet/semantic/db-global.el | 2 +- lisp/cedet/semantic/db-javascript.el | 2 +- lisp/cedet/semantic/db-mode.el | 2 +- lisp/cedet/semantic/db-ref.el | 2 +- lisp/cedet/semantic/db-typecache.el | 2 +- lisp/cedet/semantic/db.el | 2 +- lisp/cedet/semantic/debug.el | 2 +- lisp/cedet/semantic/decorate.el | 2 +- lisp/cedet/semantic/decorate/include.el | 2 +- lisp/cedet/semantic/decorate/mode.el | 2 +- lisp/cedet/semantic/dep.el | 2 +- lisp/cedet/semantic/doc.el | 2 +- lisp/cedet/semantic/ede-grammar.el | 2 +- lisp/cedet/semantic/edit.el | 2 +- lisp/cedet/semantic/find.el | 2 +- lisp/cedet/semantic/format.el | 2 +- lisp/cedet/semantic/fw.el | 2 +- lisp/cedet/semantic/grammar-wy.el | 2 +- lisp/cedet/semantic/grammar.el | 2 +- lisp/cedet/semantic/html.el | 2 +- lisp/cedet/semantic/ia-sb.el | 2 +- lisp/cedet/semantic/ia.el | 2 +- lisp/cedet/semantic/idle.el | 2 +- lisp/cedet/semantic/imenu.el | 2 +- lisp/cedet/semantic/java.el | 2 +- lisp/cedet/semantic/lex-spp.el | 2 +- lisp/cedet/semantic/lex.el | 2 +- lisp/cedet/semantic/mru-bookmark.el | 2 +- lisp/cedet/semantic/sb.el | 2 +- lisp/cedet/semantic/scope.el | 2 +- lisp/cedet/semantic/senator.el | 2 +- lisp/cedet/semantic/sort.el | 2 +- lisp/cedet/semantic/symref.el | 2 +- lisp/cedet/semantic/symref/cscope.el | 2 +- lisp/cedet/semantic/symref/filter.el | 2 +- lisp/cedet/semantic/symref/global.el | 2 +- lisp/cedet/semantic/symref/grep.el | 2 +- lisp/cedet/semantic/symref/idutils.el | 2 +- lisp/cedet/semantic/symref/list.el | 2 +- lisp/cedet/semantic/tag-file.el | 2 +- lisp/cedet/semantic/tag-ls.el | 2 +- lisp/cedet/semantic/tag-write.el | 2 +- lisp/cedet/semantic/tag.el | 2 +- lisp/cedet/semantic/texi.el | 2 +- lisp/cedet/semantic/util-modes.el | 2 +- lisp/cedet/semantic/util.el | 2 +- lisp/cedet/semantic/wisent.el | 2 +- lisp/cedet/semantic/wisent/comp.el | 2 +- lisp/cedet/semantic/wisent/java-tags.el | 2 +- lisp/cedet/semantic/wisent/javascript.el | 2 +- lisp/cedet/semantic/wisent/javat-wy.el | 2 +- lisp/cedet/semantic/wisent/js-wy.el | 2 +- lisp/cedet/semantic/wisent/python-wy.el | 2 +- lisp/cedet/semantic/wisent/python.el | 2 +- lisp/cedet/semantic/wisent/wisent.el | 2 +- lisp/cedet/srecode.el | 2 +- lisp/cedet/srecode/args.el | 2 +- lisp/cedet/srecode/compile.el | 2 +- lisp/cedet/srecode/cpp.el | 2 +- lisp/cedet/srecode/ctxt.el | 2 +- lisp/cedet/srecode/dictionary.el | 2 +- lisp/cedet/srecode/document.el | 2 +- lisp/cedet/srecode/el.el | 2 +- lisp/cedet/srecode/expandproto.el | 2 +- lisp/cedet/srecode/extract.el | 2 +- lisp/cedet/srecode/fields.el | 2 +- lisp/cedet/srecode/filters.el | 2 +- lisp/cedet/srecode/find.el | 2 +- lisp/cedet/srecode/getset.el | 2 +- lisp/cedet/srecode/insert.el | 2 +- lisp/cedet/srecode/java.el | 2 +- lisp/cedet/srecode/map.el | 2 +- lisp/cedet/srecode/mode.el | 2 +- lisp/cedet/srecode/semantic.el | 2 +- lisp/cedet/srecode/srt-mode.el | 2 +- lisp/cedet/srecode/srt-wy.el | 2 +- lisp/cedet/srecode/srt.el | 2 +- lisp/cedet/srecode/table.el | 2 +- lisp/cedet/srecode/template.el | 2 +- lisp/cedet/srecode/texi.el | 2 +- lisp/chistory.el | 2 +- lisp/cmuscheme.el | 2 +- lisp/comint.el | 2 +- lisp/compare-w.el | 2 +- lisp/complete.el | 2 +- lisp/completion.el | 2 +- lisp/cus-dep.el | 2 +- lisp/cus-edit.el | 2 +- lisp/cus-face.el | 2 +- lisp/cus-start.el | 2 +- lisp/cus-theme.el | 2 +- lisp/custom.el | 2 +- lisp/cvs-status.el | 2 +- lisp/dabbrev.el | 2 +- lisp/delim-col.el | 2 +- lisp/delsel.el | 2 +- lisp/descr-text.el | 2 +- lisp/desktop.el | 2 +- lisp/dframe.el | 2 +- lisp/diff-mode.el | 2 +- lisp/diff.el | 2 +- lisp/dired-aux.el | 2 +- lisp/dired-x.el | 2 +- lisp/dired.el | 2 +- lisp/dirtrack.el | 2 +- lisp/disp-table.el | 2 +- lisp/dnd.el | 2 +- lisp/doc-view.el | 2 +- lisp/dos-fns.el | 2 +- lisp/dos-vars.el | 2 +- lisp/dos-w32.el | 2 +- lisp/double.el | 2 +- lisp/ebuff-menu.el | 2 +- lisp/echistory.el | 2 +- lisp/ediff-diff.el | 2 +- lisp/ediff-help.el | 2 +- lisp/ediff-hook.el | 2 +- lisp/ediff-init.el | 2 +- lisp/ediff-merg.el | 2 +- lisp/ediff-mult.el | 2 +- lisp/ediff-ptch.el | 2 +- lisp/ediff-util.el | 2 +- lisp/ediff-vers.el | 2 +- lisp/ediff-wind.el | 2 +- lisp/ediff.el | 2 +- lisp/edmacro.el | 2 +- lisp/ehelp.el | 2 +- lisp/electric.el | 2 +- lisp/elide-head.el | 2 +- lisp/emacs-lisp/advice.el | 2 +- lisp/emacs-lisp/assoc.el | 2 +- lisp/emacs-lisp/authors.el | 2 +- lisp/emacs-lisp/autoload.el | 2 +- lisp/emacs-lisp/avl-tree.el | 2 +- lisp/emacs-lisp/backquote.el | 2 +- lisp/emacs-lisp/benchmark.el | 2 +- lisp/emacs-lisp/bindat.el | 2 +- lisp/emacs-lisp/byte-opt.el | 2 +- lisp/emacs-lisp/byte-run.el | 2 +- lisp/emacs-lisp/bytecomp.el | 2 +- lisp/emacs-lisp/chart.el | 2 +- lisp/emacs-lisp/check-declare.el | 2 +- lisp/emacs-lisp/checkdoc.el | 2 +- lisp/emacs-lisp/cl-extra.el | 2 +- lisp/emacs-lisp/cl-indent.el | 2 +- lisp/emacs-lisp/cl-macs.el | 2 +- lisp/emacs-lisp/cl-seq.el | 2 +- lisp/emacs-lisp/cl-specs.el | 2 +- lisp/emacs-lisp/cl.el | 2 +- lisp/emacs-lisp/copyright.el | 2 +- lisp/emacs-lisp/crm.el | 2 +- lisp/emacs-lisp/cust-print.el | 2 +- lisp/emacs-lisp/debug.el | 2 +- lisp/emacs-lisp/derived.el | 2 +- lisp/emacs-lisp/disass.el | 2 +- lisp/emacs-lisp/easy-mmode.el | 2 +- lisp/emacs-lisp/easymenu.el | 2 +- lisp/emacs-lisp/edebug.el | 2 +- lisp/emacs-lisp/eieio-base.el | 2 +- lisp/emacs-lisp/eieio-comp.el | 2 +- lisp/emacs-lisp/eieio-custom.el | 2 +- lisp/emacs-lisp/eieio-datadebug.el | 2 +- lisp/emacs-lisp/eieio-opt.el | 2 +- lisp/emacs-lisp/eieio-speedbar.el | 2 +- lisp/emacs-lisp/eieio.el | 2 +- lisp/emacs-lisp/eldoc.el | 2 +- lisp/emacs-lisp/elint.el | 2 +- lisp/emacs-lisp/elp.el | 2 +- lisp/emacs-lisp/ewoc.el | 2 +- lisp/emacs-lisp/find-func.el | 2 +- lisp/emacs-lisp/find-gc.el | 2 +- lisp/emacs-lisp/float-sup.el | 2 +- lisp/emacs-lisp/generic.el | 2 +- lisp/emacs-lisp/gulp.el | 2 +- lisp/emacs-lisp/helper.el | 2 +- lisp/emacs-lisp/lisp-mnt.el | 2 +- lisp/emacs-lisp/lisp-mode.el | 2 +- lisp/emacs-lisp/lisp.el | 2 +- lisp/emacs-lisp/macroexp.el | 2 +- lisp/emacs-lisp/map-ynp.el | 2 +- lisp/emacs-lisp/pp.el | 2 +- lisp/emacs-lisp/re-builder.el | 2 +- lisp/emacs-lisp/regexp-opt.el | 2 +- lisp/emacs-lisp/regi.el | 2 +- lisp/emacs-lisp/ring.el | 2 +- lisp/emacs-lisp/rx.el | 2 +- lisp/emacs-lisp/shadow.el | 2 +- lisp/emacs-lisp/smie.el | 2 +- lisp/emacs-lisp/sregex.el | 2 +- lisp/emacs-lisp/syntax.el | 2 +- lisp/emacs-lisp/tcover-ses.el | 2 +- lisp/emacs-lisp/tcover-unsafep.el | 2 +- lisp/emacs-lisp/testcover.el | 2 +- lisp/emacs-lisp/timer.el | 2 +- lisp/emacs-lisp/tq.el | 2 +- lisp/emacs-lisp/trace.el | 2 +- lisp/emacs-lisp/unsafep.el | 2 +- lisp/emacs-lisp/warnings.el | 2 +- lisp/emacs-lock.el | 2 +- lisp/emulation/crisp.el | 2 +- lisp/emulation/cua-base.el | 2 +- lisp/emulation/cua-gmrk.el | 2 +- lisp/emulation/cua-rect.el | 2 +- lisp/emulation/edt-lk201.el | 2 +- lisp/emulation/edt-mapper.el | 2 +- lisp/emulation/edt-pc.el | 2 +- lisp/emulation/edt-vt100.el | 2 +- lisp/emulation/edt.el | 2 +- lisp/emulation/keypad.el | 2 +- lisp/emulation/pc-mode.el | 2 +- lisp/emulation/pc-select.el | 2 +- lisp/emulation/tpu-edt.el | 2 +- lisp/emulation/tpu-extras.el | 2 +- lisp/emulation/tpu-mapper.el | 2 +- lisp/emulation/vip.el | 2 +- lisp/emulation/viper-cmd.el | 2 +- lisp/emulation/viper-ex.el | 2 +- lisp/emulation/viper-init.el | 2 +- lisp/emulation/viper-keym.el | 2 +- lisp/emulation/viper-macs.el | 2 +- lisp/emulation/viper-mous.el | 2 +- lisp/emulation/viper-util.el | 2 +- lisp/emulation/viper.el | 2 +- lisp/emulation/ws-mode.el | 2 +- lisp/env.el | 2 +- lisp/epa-dired.el | 2 +- lisp/epa-file.el | 2 +- lisp/epa-hook.el | 2 +- lisp/epa-mail.el | 2 +- lisp/epa.el | 2 +- lisp/epg-config.el | 2 +- lisp/epg.el | 2 +- lisp/erc/ChangeLog | 2 +- lisp/erc/ChangeLog.01 | 2 +- lisp/erc/ChangeLog.02 | 2 +- lisp/erc/ChangeLog.03 | 2 +- lisp/erc/ChangeLog.04 | 2 +- lisp/erc/ChangeLog.05 | 2 +- lisp/erc/ChangeLog.06 | 2 +- lisp/erc/ChangeLog.07 | 2 +- lisp/erc/ChangeLog.08 | 2 +- lisp/erc/erc-autoaway.el | 2 +- lisp/erc/erc-backend.el | 2 +- lisp/erc/erc-button.el | 2 +- lisp/erc/erc-capab.el | 2 +- lisp/erc/erc-compat.el | 2 +- lisp/erc/erc-dcc.el | 2 +- lisp/erc/erc-ezbounce.el | 2 +- lisp/erc/erc-fill.el | 2 +- lisp/erc/erc-goodies.el | 2 +- lisp/erc/erc-hecomplete.el | 2 +- lisp/erc/erc-ibuffer.el | 2 +- lisp/erc/erc-identd.el | 2 +- lisp/erc/erc-imenu.el | 2 +- lisp/erc/erc-join.el | 2 +- lisp/erc/erc-lang.el | 2 +- lisp/erc/erc-list.el | 2 +- lisp/erc/erc-log.el | 2 +- lisp/erc/erc-match.el | 2 +- lisp/erc/erc-menu.el | 2 +- lisp/erc/erc-netsplit.el | 2 +- lisp/erc/erc-networks.el | 2 +- lisp/erc/erc-notify.el | 2 +- lisp/erc/erc-page.el | 2 +- lisp/erc/erc-pcomplete.el | 2 +- lisp/erc/erc-replace.el | 2 +- lisp/erc/erc-ring.el | 2 +- lisp/erc/erc-services.el | 2 +- lisp/erc/erc-sound.el | 2 +- lisp/erc/erc-speedbar.el | 2 +- lisp/erc/erc-spelling.el | 2 +- lisp/erc/erc-stamp.el | 2 +- lisp/erc/erc-track.el | 2 +- lisp/erc/erc-truncate.el | 2 +- lisp/erc/erc-xdcc.el | 2 +- lisp/erc/erc.el | 2 +- lisp/eshell/em-alias.el | 2 +- lisp/eshell/em-banner.el | 2 +- lisp/eshell/em-basic.el | 2 +- lisp/eshell/em-cmpl.el | 2 +- lisp/eshell/em-dirs.el | 2 +- lisp/eshell/em-glob.el | 2 +- lisp/eshell/em-hist.el | 2 +- lisp/eshell/em-ls.el | 2 +- lisp/eshell/em-pred.el | 2 +- lisp/eshell/em-prompt.el | 2 +- lisp/eshell/em-rebind.el | 2 +- lisp/eshell/em-script.el | 2 +- lisp/eshell/em-smart.el | 2 +- lisp/eshell/em-term.el | 2 +- lisp/eshell/em-unix.el | 2 +- lisp/eshell/em-xtra.el | 2 +- lisp/eshell/esh-arg.el | 2 +- lisp/eshell/esh-cmd.el | 2 +- lisp/eshell/esh-ext.el | 2 +- lisp/eshell/esh-io.el | 2 +- lisp/eshell/esh-mode.el | 2 +- lisp/eshell/esh-module.el | 2 +- lisp/eshell/esh-opt.el | 2 +- lisp/eshell/esh-proc.el | 2 +- lisp/eshell/esh-test.el | 2 +- lisp/eshell/esh-util.el | 2 +- lisp/eshell/esh-var.el | 2 +- lisp/eshell/eshell.el | 2 +- lisp/expand.el | 2 +- lisp/ezimage.el | 2 +- lisp/face-remap.el | 2 +- lisp/facemenu.el | 2 +- lisp/faces.el | 2 +- lisp/ffap.el | 2 +- lisp/filecache.el | 2 +- lisp/files-x.el | 2 +- lisp/files.el | 2 +- lisp/filesets.el | 2 +- lisp/find-cmd.el | 2 +- lisp/find-dired.el | 2 +- lisp/find-file.el | 2 +- lisp/find-lisp.el | 2 +- lisp/finder.el | 2 +- lisp/flow-ctrl.el | 2 +- lisp/foldout.el | 2 +- lisp/follow.el | 2 +- lisp/font-core.el | 2 +- lisp/font-lock.el | 2 +- lisp/font-setting.el | 2 +- lisp/format-spec.el | 2 +- lisp/format.el | 2 +- lisp/forms-d2.el | 2 +- lisp/forms.el | 2 +- lisp/frame.el | 2 +- lisp/fringe.el | 2 +- lisp/generic-x.el | 2 +- lisp/gnus/ChangeLog | 2 +- lisp/gnus/ChangeLog.1 | 2 +- lisp/gnus/ChangeLog.2 | 2 +- lisp/gnus/auth-source.el | 2 +- lisp/gnus/canlock.el | 2 +- lisp/gnus/compface.el | 2 +- lisp/gnus/deuglify.el | 2 +- lisp/gnus/earcon.el | 2 +- lisp/gnus/ecomplete.el | 2 +- lisp/gnus/flow-fill.el | 2 +- lisp/gnus/gmm-utils.el | 2 +- lisp/gnus/gnus-agent.el | 2 +- lisp/gnus/gnus-art.el | 2 +- lisp/gnus/gnus-async.el | 2 +- lisp/gnus/gnus-audio.el | 2 +- lisp/gnus/gnus-bcklg.el | 2 +- lisp/gnus/gnus-bookmark.el | 2 +- lisp/gnus/gnus-cache.el | 2 +- lisp/gnus/gnus-cite.el | 2 +- lisp/gnus/gnus-cus.el | 2 +- lisp/gnus/gnus-delay.el | 2 +- lisp/gnus/gnus-demon.el | 2 +- lisp/gnus/gnus-diary.el | 2 +- lisp/gnus/gnus-dired.el | 2 +- lisp/gnus/gnus-draft.el | 2 +- lisp/gnus/gnus-dup.el | 2 +- lisp/gnus/gnus-eform.el | 2 +- lisp/gnus/gnus-ems.el | 2 +- lisp/gnus/gnus-fun.el | 2 +- lisp/gnus/gnus-group.el | 2 +- lisp/gnus/gnus-int.el | 2 +- lisp/gnus/gnus-kill.el | 2 +- lisp/gnus/gnus-logic.el | 2 +- lisp/gnus/gnus-mh.el | 2 +- lisp/gnus/gnus-ml.el | 2 +- lisp/gnus/gnus-mlspl.el | 2 +- lisp/gnus/gnus-move.el | 2 +- lisp/gnus/gnus-msg.el | 2 +- lisp/gnus/gnus-nocem.el | 2 +- lisp/gnus/gnus-picon.el | 2 +- lisp/gnus/gnus-range.el | 2 +- lisp/gnus/gnus-registry.el | 2 +- lisp/gnus/gnus-salt.el | 2 +- lisp/gnus/gnus-score.el | 2 +- lisp/gnus/gnus-setup.el | 2 +- lisp/gnus/gnus-sieve.el | 2 +- lisp/gnus/gnus-soup.el | 2 +- lisp/gnus/gnus-spec.el | 2 +- lisp/gnus/gnus-srvr.el | 2 +- lisp/gnus/gnus-start.el | 2 +- lisp/gnus/gnus-sum.el | 2 +- lisp/gnus/gnus-topic.el | 2 +- lisp/gnus/gnus-undo.el | 2 +- lisp/gnus/gnus-util.el | 2 +- lisp/gnus/gnus-uu.el | 2 +- lisp/gnus/gnus-vm.el | 2 +- lisp/gnus/gnus-win.el | 2 +- lisp/gnus/gnus.el | 2 +- lisp/gnus/html2text.el | 2 +- lisp/gnus/ietf-drums.el | 2 +- lisp/gnus/legacy-gnus-agent.el | 2 +- lisp/gnus/mail-parse.el | 2 +- lisp/gnus/mail-prsvr.el | 2 +- lisp/gnus/mail-source.el | 2 +- lisp/gnus/mailcap.el | 2 +- lisp/gnus/message.el | 2 +- lisp/gnus/messcompat.el | 2 +- lisp/gnus/mm-bodies.el | 2 +- lisp/gnus/mm-decode.el | 2 +- lisp/gnus/mm-encode.el | 2 +- lisp/gnus/mm-extern.el | 2 +- lisp/gnus/mm-partial.el | 2 +- lisp/gnus/mm-url.el | 2 +- lisp/gnus/mm-util.el | 2 +- lisp/gnus/mm-uu.el | 2 +- lisp/gnus/mm-view.el | 2 +- lisp/gnus/mml-sec.el | 2 +- lisp/gnus/mml-smime.el | 2 +- lisp/gnus/mml.el | 2 +- lisp/gnus/mml1991.el | 2 +- lisp/gnus/mml2015.el | 2 +- lisp/gnus/nnagent.el | 2 +- lisp/gnus/nnbabyl.el | 2 +- lisp/gnus/nndb.el | 2 +- lisp/gnus/nndiary.el | 2 +- lisp/gnus/nndir.el | 2 +- lisp/gnus/nndoc.el | 2 +- lisp/gnus/nndraft.el | 2 +- lisp/gnus/nneething.el | 2 +- lisp/gnus/nnfolder.el | 2 +- lisp/gnus/nngateway.el | 2 +- lisp/gnus/nnheader.el | 2 +- lisp/gnus/nnimap.el | 2 +- lisp/gnus/nnir.el | 2 +- lisp/gnus/nnkiboze.el | 2 +- lisp/gnus/nnlistserv.el | 2 +- lisp/gnus/nnmail.el | 2 +- lisp/gnus/nnmairix.el | 2 +- lisp/gnus/nnmbox.el | 2 +- lisp/gnus/nnmh.el | 2 +- lisp/gnus/nnml.el | 2 +- lisp/gnus/nnoo.el | 2 +- lisp/gnus/nnrss.el | 2 +- lisp/gnus/nnslashdot.el | 2 +- lisp/gnus/nnsoup.el | 2 +- lisp/gnus/nnspool.el | 2 +- lisp/gnus/nntp.el | 2 +- lisp/gnus/nnultimate.el | 2 +- lisp/gnus/nnvirtual.el | 2 +- lisp/gnus/nnwarchive.el | 2 +- lisp/gnus/nnweb.el | 2 +- lisp/gnus/nnwfm.el | 2 +- lisp/gnus/pop3.el | 2 +- lisp/gnus/qp.el | 2 +- lisp/gnus/rfc1843.el | 2 +- lisp/gnus/rfc2045.el | 2 +- lisp/gnus/rfc2047.el | 2 +- lisp/gnus/rfc2104.el | 2 +- lisp/gnus/rfc2231.el | 2 +- lisp/gnus/score-mode.el | 2 +- lisp/gnus/sieve-manage.el | 2 +- lisp/gnus/sieve-mode.el | 2 +- lisp/gnus/sieve.el | 2 +- lisp/gnus/smiley.el | 2 +- lisp/gnus/smime.el | 2 +- lisp/gnus/spam-report.el | 2 +- lisp/gnus/spam-stat.el | 2 +- lisp/gnus/spam-wash.el | 2 +- lisp/gnus/spam.el | 2 +- lisp/gnus/starttls.el | 2 +- lisp/gnus/utf7.el | 2 +- lisp/gnus/webmail.el | 2 +- lisp/gnus/yenc.el | 2 +- lisp/gs.el | 2 +- lisp/help-at-pt.el | 2 +- lisp/help-fns.el | 2 +- lisp/help-macro.el | 2 +- lisp/help-mode.el | 2 +- lisp/help.el | 2 +- lisp/hex-util.el | 2 +- lisp/hexl.el | 2 +- lisp/hfy-cmap.el | 2 +- lisp/hi-lock.el | 2 +- lisp/hilit-chg.el | 2 +- lisp/hippie-exp.el | 2 +- lisp/hl-line.el | 2 +- lisp/htmlfontify.el | 2 +- lisp/ibuf-ext.el | 2 +- lisp/ibuf-macs.el | 2 +- lisp/ibuffer.el | 2 +- lisp/icomplete.el | 2 +- lisp/ido.el | 2 +- lisp/ielm.el | 2 +- lisp/iimage.el | 2 +- lisp/image-dired.el | 2 +- lisp/image-file.el | 2 +- lisp/image-mode.el | 2 +- lisp/image.el | 2 +- lisp/imenu.el | 2 +- lisp/indent.el | 2 +- lisp/info-look.el | 2 +- lisp/info-xref.el | 2 +- lisp/info.el | 2 +- lisp/informat.el | 2 +- lisp/international/ccl.el | 2 +- lisp/international/characters.el | 2 +- lisp/international/fontset.el | 2 +- lisp/international/isearch-x.el | 2 +- lisp/international/iso-ascii.el | 2 +- lisp/international/iso-cvt.el | 2 +- lisp/international/iso-transl.el | 2 +- lisp/international/kinsoku.el | 2 +- lisp/international/kkc.el | 2 +- lisp/international/latexenc.el | 2 +- lisp/international/latin1-disp.el | 2 +- lisp/international/mule-cmds.el | 2 +- lisp/international/mule-conf.el | 2 +- lisp/international/mule-diag.el | 2 +- lisp/international/mule-util.el | 2 +- lisp/international/mule.el | 2 +- lisp/international/ogonek.el | 2 +- lisp/international/quail.el | 2 +- lisp/international/titdic-cnv.el | 2 +- lisp/international/ucs-normalize.el | 2 +- lisp/international/utf-7.el | 2 +- lisp/isearch.el | 2 +- lisp/isearchb.el | 2 +- lisp/iswitchb.el | 2 +- lisp/jit-lock.el | 2 +- lisp/jka-cmpr-hook.el | 2 +- lisp/jka-compr.el | 2 +- lisp/json.el | 2 +- lisp/kermit.el | 2 +- lisp/kmacro.el | 2 +- lisp/language/china-util.el | 2 +- lisp/language/chinese.el | 2 +- lisp/language/cyril-util.el | 2 +- lisp/language/cyrillic.el | 2 +- lisp/language/czech.el | 2 +- lisp/language/english.el | 2 +- lisp/language/ethio-util.el | 2 +- lisp/language/ethiopic.el | 2 +- lisp/language/european.el | 2 +- lisp/language/georgian.el | 2 +- lisp/language/hanja-util.el | 2 +- lisp/language/hebrew.el | 2 +- lisp/language/ind-util.el | 2 +- lisp/language/indian.el | 2 +- lisp/language/japan-util.el | 2 +- lisp/language/japanese.el | 2 +- lisp/language/korea-util.el | 2 +- lisp/language/korean.el | 2 +- lisp/language/lao-util.el | 2 +- lisp/language/lao.el | 2 +- lisp/language/romanian.el | 2 +- lisp/language/slovak.el | 2 +- lisp/language/tai-viet.el | 4 ++-- lisp/language/thai-util.el | 4 ++-- lisp/language/thai.el | 4 ++-- lisp/language/tibet-util.el | 2 +- lisp/language/tibetan.el | 2 +- lisp/language/utf-8-lang.el | 2 +- lisp/language/viet-util.el | 2 +- lisp/language/vietnamese.el | 2 +- lisp/ledit.el | 2 +- lisp/linum.el | 2 +- lisp/loadhist.el | 2 +- lisp/loadup.el | 2 +- lisp/locate.el | 2 +- lisp/log-edit.el | 2 +- lisp/log-view.el | 2 +- lisp/longlines.el | 2 +- lisp/lpr.el | 2 +- lisp/ls-lisp.el | 2 +- lisp/macros.el | 2 +- lisp/mail/binhex.el | 2 +- lisp/mail/blessmail.el | 2 +- lisp/mail/emacsbug.el | 2 +- lisp/mail/footnote.el | 2 +- lisp/mail/hashcash.el | 2 +- lisp/mail/mail-extr.el | 2 +- lisp/mail/mail-hist.el | 2 +- lisp/mail/mail-utils.el | 2 +- lisp/mail/mailabbrev.el | 2 +- lisp/mail/mailalias.el | 2 +- lisp/mail/mailclient.el | 2 +- lisp/mail/mailheader.el | 2 +- lisp/mail/metamail.el | 2 +- lisp/mail/mspools.el | 2 +- lisp/mail/reporter.el | 2 +- lisp/mail/rfc2368.el | 2 +- lisp/mail/rfc822.el | 2 +- lisp/mail/rmail-spam-filter.el | 2 +- lisp/mail/rmail.el | 2 +- lisp/mail/rmailedit.el | 2 +- lisp/mail/rmailkwd.el | 2 +- lisp/mail/rmailmm.el | 2 +- lisp/mail/rmailmsc.el | 2 +- lisp/mail/rmailout.el | 2 +- lisp/mail/rmailsort.el | 2 +- lisp/mail/rmailsum.el | 2 +- lisp/mail/sendmail.el | 2 +- lisp/mail/smtpmail.el | 2 +- lisp/mail/supercite.el | 2 +- lisp/mail/uce.el | 2 +- lisp/mail/undigest.el | 2 +- lisp/mail/unrmail.el | 2 +- lisp/mail/uudecode.el | 2 +- lisp/makefile.w32-in | 2 +- lisp/makesum.el | 2 +- lisp/man.el | 2 +- lisp/master.el | 2 +- lisp/mb-depth.el | 2 +- lisp/md4.el | 2 +- lisp/menu-bar.el | 2 +- lisp/mh-e/ChangeLog | 2 +- lisp/mh-e/ChangeLog.1 | 2 +- lisp/mh-e/mh-acros.el | 2 +- lisp/mh-e/mh-alias.el | 2 +- lisp/mh-e/mh-buffers.el | 2 +- lisp/mh-e/mh-comp.el | 2 +- lisp/mh-e/mh-compat.el | 2 +- lisp/mh-e/mh-e.el | 2 +- lisp/mh-e/mh-folder.el | 2 +- lisp/mh-e/mh-funcs.el | 2 +- lisp/mh-e/mh-gnus.el | 2 +- lisp/mh-e/mh-identity.el | 2 +- lisp/mh-e/mh-inc.el | 2 +- lisp/mh-e/mh-junk.el | 2 +- lisp/mh-e/mh-letter.el | 2 +- lisp/mh-e/mh-limit.el | 2 +- lisp/mh-e/mh-mime.el | 2 +- lisp/mh-e/mh-print.el | 2 +- lisp/mh-e/mh-scan.el | 2 +- lisp/mh-e/mh-search.el | 2 +- lisp/mh-e/mh-seq.el | 2 +- lisp/mh-e/mh-show.el | 2 +- lisp/mh-e/mh-speed.el | 2 +- lisp/mh-e/mh-thread.el | 2 +- lisp/mh-e/mh-tool-bar.el | 2 +- lisp/mh-e/mh-utils.el | 2 +- lisp/mh-e/mh-xface.el | 2 +- lisp/midnight.el | 2 +- lisp/minibuf-eldef.el | 2 +- lisp/minibuffer.el | 2 +- lisp/misc.el | 2 +- lisp/misearch.el | 2 +- lisp/mouse-copy.el | 2 +- lisp/mouse-drag.el | 2 +- lisp/mouse-sel.el | 2 +- lisp/mouse.el | 2 +- lisp/mpc.el | 2 +- lisp/msb.el | 2 +- lisp/mwheel.el | 2 +- lisp/net/ange-ftp.el | 2 +- lisp/net/browse-url.el | 2 +- lisp/net/dbus.el | 2 +- lisp/net/dig.el | 2 +- lisp/net/dns.el | 2 +- lisp/net/eudc-bob.el | 2 +- lisp/net/eudc-export.el | 2 +- lisp/net/eudc-hotlist.el | 2 +- lisp/net/eudc-vars.el | 2 +- lisp/net/eudc.el | 2 +- lisp/net/eudcb-bbdb.el | 2 +- lisp/net/eudcb-ldap.el | 2 +- lisp/net/eudcb-mab.el | 2 +- lisp/net/eudcb-ph.el | 2 +- lisp/net/goto-addr.el | 2 +- lisp/net/hmac-def.el | 2 +- lisp/net/hmac-md5.el | 2 +- lisp/net/imap-hash.el | 2 +- lisp/net/imap.el | 2 +- lisp/net/ldap.el | 2 +- lisp/net/mairix.el | 2 +- lisp/net/net-utils.el | 2 +- lisp/net/netrc.el | 2 +- lisp/net/newst-backend.el | 2 +- lisp/net/newst-plainview.el | 2 +- lisp/net/newst-reader.el | 2 +- lisp/net/newst-ticker.el | 2 +- lisp/net/newst-treeview.el | 2 +- lisp/net/newsticker.el | 2 +- lisp/net/ntlm.el | 2 +- lisp/net/quickurl.el | 2 +- lisp/net/rcirc.el | 2 +- lisp/net/rcompile.el | 2 +- lisp/net/rlogin.el | 2 +- lisp/net/sasl-cram.el | 2 +- lisp/net/sasl-digest.el | 2 +- lisp/net/sasl-ntlm.el | 2 +- lisp/net/sasl.el | 2 +- lisp/net/snmp-mode.el | 2 +- lisp/net/socks.el | 2 +- lisp/net/telnet.el | 2 +- lisp/net/tls.el | 2 +- lisp/net/tramp-cache.el | 2 +- lisp/net/tramp-cmds.el | 2 +- lisp/net/tramp-compat.el | 2 +- lisp/net/tramp-fish.el | 2 +- lisp/net/tramp-ftp.el | 2 +- lisp/net/tramp-gvfs.el | 2 +- lisp/net/tramp-gw.el | 2 +- lisp/net/tramp-imap.el | 2 +- lisp/net/tramp-smb.el | 2 +- lisp/net/tramp-uu.el | 2 +- lisp/net/tramp.el | 6 +++--- lisp/net/trampver.el | 2 +- lisp/net/webjump.el | 2 +- lisp/net/xesam.el | 2 +- lisp/net/zeroconf.el | 2 +- lisp/newcomment.el | 2 +- lisp/novice.el | 2 +- lisp/nxml/nxml-enc.el | 2 +- lisp/nxml/nxml-glyph.el | 2 +- lisp/nxml/nxml-maint.el | 2 +- lisp/nxml/nxml-mode.el | 2 +- lisp/nxml/nxml-ns.el | 2 +- lisp/nxml/nxml-outln.el | 2 +- lisp/nxml/nxml-parse.el | 2 +- lisp/nxml/nxml-rap.el | 2 +- lisp/nxml/nxml-uchnm.el | 2 +- lisp/nxml/nxml-util.el | 2 +- lisp/nxml/rng-cmpct.el | 2 +- lisp/nxml/rng-dt.el | 2 +- lisp/nxml/rng-loc.el | 2 +- lisp/nxml/rng-maint.el | 2 +- lisp/nxml/rng-match.el | 2 +- lisp/nxml/rng-nxml.el | 2 +- lisp/nxml/rng-parse.el | 2 +- lisp/nxml/rng-pttrn.el | 2 +- lisp/nxml/rng-uri.el | 2 +- lisp/nxml/rng-util.el | 2 +- lisp/nxml/rng-valid.el | 2 +- lisp/nxml/rng-xsd.el | 2 +- lisp/nxml/xmltok.el | 2 +- lisp/nxml/xsd-regexp.el | 2 +- lisp/obsolete/awk-mode.el | 2 +- lisp/obsolete/cl-compat.el | 2 +- lisp/obsolete/fast-lock.el | 2 +- lisp/obsolete/iso-acc.el | 2 +- lisp/obsolete/iso-insert.el | 2 +- lisp/obsolete/iso-swed.el | 2 +- lisp/obsolete/keyswap.el | 2 +- lisp/obsolete/lazy-lock.el | 2 +- lisp/obsolete/levents.el | 2 +- lisp/obsolete/lmenu.el | 2 +- lisp/obsolete/lucid.el | 2 +- lisp/obsolete/old-whitespace.el | 2 +- lisp/obsolete/options.el | 2 +- lisp/obsolete/resume.el | 2 +- lisp/obsolete/rnews.el | 2 +- lisp/obsolete/rnewspost.el | 2 +- lisp/obsolete/scribe.el | 2 +- lisp/obsolete/swedish.el | 2 +- lisp/obsolete/sym-comp.el | 2 +- lisp/obsolete/vc-mcvs.el | 2 +- lisp/obsolete/x-menu.el | 2 +- lisp/org/ChangeLog | 2 +- lisp/org/org-agenda.el | 2 +- lisp/org/org-archive.el | 2 +- lisp/org/org-ascii.el | 2 +- lisp/org/org-attach.el | 2 +- lisp/org/org-bbdb.el | 2 +- lisp/org/org-bibtex.el | 2 +- lisp/org/org-clock.el | 2 +- lisp/org/org-colview.el | 2 +- lisp/org/org-compat.el | 2 +- lisp/org/org-crypt.el | 2 +- lisp/org/org-datetree.el | 2 +- lisp/org/org-docbook.el | 2 +- lisp/org/org-exp-blocks.el | 2 +- lisp/org/org-exp.el | 2 +- lisp/org/org-faces.el | 2 +- lisp/org/org-feed.el | 2 +- lisp/org/org-footnote.el | 2 +- lisp/org/org-freemind.el | 2 +- lisp/org/org-gnus.el | 2 +- lisp/org/org-habit.el | 2 +- lisp/org/org-html.el | 2 +- lisp/org/org-icalendar.el | 2 +- lisp/org/org-id.el | 2 +- lisp/org/org-indent.el | 2 +- lisp/org/org-info.el | 2 +- lisp/org/org-inlinetask.el | 2 +- lisp/org/org-install.el | 2 +- lisp/org/org-irc.el | 2 +- lisp/org/org-jsinfo.el | 2 +- lisp/org/org-latex.el | 2 +- lisp/org/org-list.el | 2 +- lisp/org/org-mac-message.el | 2 +- lisp/org/org-macs.el | 2 +- lisp/org/org-mew.el | 2 +- lisp/org/org-mhe.el | 2 +- lisp/org/org-mobile.el | 2 +- lisp/org/org-mouse.el | 2 +- lisp/org/org-plot.el | 2 +- lisp/org/org-protocol.el | 2 +- lisp/org/org-publish.el | 2 +- lisp/org/org-remember.el | 2 +- lisp/org/org-rmail.el | 2 +- lisp/org/org-src.el | 2 +- lisp/org/org-table.el | 2 +- lisp/org/org-timer.el | 2 +- lisp/org/org-vm.el | 2 +- lisp/org/org-w3m.el | 2 +- lisp/org/org-wl.el | 2 +- lisp/org/org-xoxo.el | 2 +- lisp/org/org.el | 2 +- lisp/outline.el | 2 +- lisp/paren.el | 2 +- lisp/password-cache.el | 2 +- lisp/paths.el | 2 +- lisp/pcmpl-cvs.el | 2 +- lisp/pcmpl-gnu.el | 2 +- lisp/pcmpl-linux.el | 2 +- lisp/pcmpl-rpm.el | 2 +- lisp/pcmpl-unix.el | 2 +- lisp/pcomplete.el | 2 +- lisp/pcvs-defs.el | 2 +- lisp/pcvs-info.el | 2 +- lisp/pcvs-parse.el | 2 +- lisp/pcvs-util.el | 2 +- lisp/pcvs.el | 2 +- lisp/pgg-def.el | 2 +- lisp/pgg-gpg.el | 2 +- lisp/pgg-parse.el | 2 +- lisp/pgg-pgp.el | 2 +- lisp/pgg-pgp5.el | 2 +- lisp/pgg.el | 2 +- lisp/play/5x5.el | 2 +- lisp/play/animate.el | 2 +- lisp/play/blackbox.el | 2 +- lisp/play/bruce.el | 2 +- lisp/play/bubbles.el | 2 +- lisp/play/cookie1.el | 2 +- lisp/play/decipher.el | 2 +- lisp/play/dissociate.el | 2 +- lisp/play/doctor.el | 2 +- lisp/play/dunnet.el | 2 +- lisp/play/fortune.el | 2 +- lisp/play/gamegrid.el | 2 +- lisp/play/gametree.el | 2 +- lisp/play/gomoku.el | 2 +- lisp/play/handwrite.el | 2 +- lisp/play/landmark.el | 2 +- lisp/play/life.el | 2 +- lisp/play/morse.el | 2 +- lisp/play/mpuz.el | 2 +- lisp/play/pong.el | 2 +- lisp/play/snake.el | 2 +- lisp/play/solitaire.el | 2 +- lisp/play/spook.el | 2 +- lisp/play/tetris.el | 2 +- lisp/play/yow.el | 2 +- lisp/play/zone.el | 2 +- lisp/printing.el | 2 +- lisp/proced.el | 2 +- lisp/progmodes/ada-mode.el | 2 +- lisp/progmodes/ada-prj.el | 2 +- lisp/progmodes/ada-stmt.el | 2 +- lisp/progmodes/ada-xref.el | 2 +- lisp/progmodes/antlr-mode.el | 2 +- lisp/progmodes/asm-mode.el | 2 +- lisp/progmodes/autoconf.el | 2 +- lisp/progmodes/bug-reference.el | 2 +- lisp/progmodes/cap-words.el | 2 +- lisp/progmodes/cc-align.el | 2 +- lisp/progmodes/cc-awk.el | 2 +- lisp/progmodes/cc-bytecomp.el | 2 +- lisp/progmodes/cc-cmds.el | 2 +- lisp/progmodes/cc-compat.el | 2 +- lisp/progmodes/cc-defs.el | 2 +- lisp/progmodes/cc-engine.el | 2 +- lisp/progmodes/cc-fonts.el | 2 +- lisp/progmodes/cc-langs.el | 2 +- lisp/progmodes/cc-menus.el | 2 +- lisp/progmodes/cc-mode.el | 2 +- lisp/progmodes/cc-styles.el | 2 +- lisp/progmodes/cc-vars.el | 2 +- lisp/progmodes/cfengine.el | 2 +- lisp/progmodes/cmacexp.el | 2 +- lisp/progmodes/compile.el | 2 +- lisp/progmodes/cperl-mode.el | 2 +- lisp/progmodes/cpp.el | 2 +- lisp/progmodes/cwarn.el | 2 +- lisp/progmodes/dcl-mode.el | 2 +- lisp/progmodes/delphi.el | 2 +- lisp/progmodes/ebnf-abn.el | 2 +- lisp/progmodes/ebnf-bnf.el | 2 +- lisp/progmodes/ebnf-dtd.el | 2 +- lisp/progmodes/ebnf-ebx.el | 2 +- lisp/progmodes/ebnf-iso.el | 2 +- lisp/progmodes/ebnf-otz.el | 2 +- lisp/progmodes/ebnf-yac.el | 2 +- lisp/progmodes/ebnf2ps.el | 2 +- lisp/progmodes/ebrowse.el | 2 +- lisp/progmodes/etags.el | 2 +- lisp/progmodes/executable.el | 2 +- lisp/progmodes/f90.el | 2 +- lisp/progmodes/flymake.el | 2 +- lisp/progmodes/fortran.el | 2 +- lisp/progmodes/gdb-ui.el | 2 +- lisp/progmodes/glasses.el | 2 +- lisp/progmodes/grep.el | 2 +- lisp/progmodes/gud.el | 2 +- lisp/progmodes/hideif.el | 2 +- lisp/progmodes/hideshow.el | 2 +- lisp/progmodes/icon.el | 2 +- lisp/progmodes/idlw-complete-structtag.el | 2 +- lisp/progmodes/idlw-help.el | 2 +- lisp/progmodes/idlw-shell.el | 2 +- lisp/progmodes/idlw-toolbar.el | 2 +- lisp/progmodes/idlwave.el | 2 +- lisp/progmodes/inf-lisp.el | 2 +- lisp/progmodes/js.el | 2 +- lisp/progmodes/ld-script.el | 2 +- lisp/progmodes/m4-mode.el | 2 +- lisp/progmodes/make-mode.el | 2 +- lisp/progmodes/mantemp.el | 2 +- lisp/progmodes/meta-mode.el | 2 +- lisp/progmodes/mixal-mode.el | 2 +- lisp/progmodes/octave-inf.el | 2 +- lisp/progmodes/octave-mod.el | 2 +- lisp/progmodes/pascal.el | 2 +- lisp/progmodes/perl-mode.el | 2 +- lisp/progmodes/prolog.el | 2 +- lisp/progmodes/ps-mode.el | 2 +- lisp/progmodes/python.el | 2 +- lisp/progmodes/ruby-mode.el | 2 +- lisp/progmodes/scheme.el | 2 +- lisp/progmodes/sh-script.el | 2 +- lisp/progmodes/simula.el | 2 +- lisp/progmodes/sql.el | 2 +- lisp/progmodes/subword.el | 2 +- lisp/progmodes/tcl.el | 2 +- lisp/progmodes/vera-mode.el | 2 +- lisp/progmodes/verilog-mode.el | 2 +- lisp/progmodes/vhdl-mode.el | 2 +- lisp/progmodes/which-func.el | 2 +- lisp/progmodes/xscheme.el | 2 +- lisp/ps-bdf.el | 2 +- lisp/ps-def.el | 2 +- lisp/ps-mule.el | 2 +- lisp/ps-print.el | 2 +- lisp/ps-samp.el | 2 +- lisp/recentf.el | 2 +- lisp/rect.el | 2 +- lisp/register.el | 2 +- lisp/repeat.el | 2 +- lisp/replace.el | 2 +- lisp/reposition.el | 2 +- lisp/reveal.el | 2 +- lisp/rfn-eshadow.el | 2 +- lisp/rot13.el | 2 +- lisp/ruler-mode.el | 2 +- lisp/s-region.el | 2 +- lisp/savehist.el | 2 +- lisp/saveplace.el | 2 +- lisp/sb-image.el | 2 +- lisp/scroll-all.el | 2 +- lisp/scroll-bar.el | 2 +- lisp/scroll-lock.el | 2 +- lisp/select.el | 2 +- lisp/server.el | 2 +- lisp/ses.el | 2 +- lisp/sha1.el | 2 +- lisp/shadowfile.el | 2 +- lisp/shell.el | 2 +- lisp/simple.el | 2 +- lisp/skeleton.el | 2 +- lisp/smerge-mode.el | 2 +- lisp/sort.el | 2 +- lisp/soundex.el | 2 +- lisp/speedbar.el | 2 +- lisp/startup.el | 2 +- lisp/strokes.el | 2 +- lisp/subr.el | 2 +- lisp/t-mouse.el | 2 +- lisp/tabify.el | 2 +- lisp/talk.el | 2 +- lisp/tar-mode.el | 2 +- lisp/tempo.el | 2 +- lisp/term.el | 2 +- lisp/term/AT386.el | 2 +- lisp/term/README | 2 +- lisp/term/common-win.el | 2 +- lisp/term/internal.el | 2 +- lisp/term/iris-ansi.el | 2 +- lisp/term/news.el | 2 +- lisp/term/ns-win.el | 2 +- lisp/term/pc-win.el | 2 +- lisp/term/rxvt.el | 2 +- lisp/term/sun.el | 2 +- lisp/term/sup-mouse.el | 2 +- lisp/term/tty-colors.el | 2 +- lisp/term/tvi970.el | 2 +- lisp/term/vt100.el | 2 +- lisp/term/w32-win.el | 2 +- lisp/term/w32console.el | 2 +- lisp/term/wyse50.el | 2 +- lisp/term/x-win.el | 2 +- lisp/term/xterm.el | 2 +- lisp/terminal.el | 2 +- lisp/textmodes/artist.el | 2 +- lisp/textmodes/bib-mode.el | 2 +- lisp/textmodes/bibtex-style.el | 2 +- lisp/textmodes/bibtex.el | 2 +- lisp/textmodes/conf-mode.el | 2 +- lisp/textmodes/css-mode.el | 2 +- lisp/textmodes/dns-mode.el | 2 +- lisp/textmodes/enriched.el | 2 +- lisp/textmodes/fill.el | 2 +- lisp/textmodes/flyspell.el | 2 +- lisp/textmodes/ispell.el | 2 +- lisp/textmodes/makeinfo.el | 2 +- lisp/textmodes/nroff-mode.el | 2 +- lisp/textmodes/page-ext.el | 2 +- lisp/textmodes/page.el | 2 +- lisp/textmodes/paragraphs.el | 2 +- lisp/textmodes/picture.el | 2 +- lisp/textmodes/po.el | 2 +- lisp/textmodes/refbib.el | 2 +- lisp/textmodes/refer.el | 2 +- lisp/textmodes/refill.el | 2 +- lisp/textmodes/reftex-auc.el | 2 +- lisp/textmodes/reftex-cite.el | 2 +- lisp/textmodes/reftex-dcr.el | 2 +- lisp/textmodes/reftex-global.el | 2 +- lisp/textmodes/reftex-index.el | 2 +- lisp/textmodes/reftex-parse.el | 2 +- lisp/textmodes/reftex-ref.el | 2 +- lisp/textmodes/reftex-sel.el | 2 +- lisp/textmodes/reftex-toc.el | 2 +- lisp/textmodes/reftex-vars.el | 2 +- lisp/textmodes/reftex.el | 2 +- lisp/textmodes/remember.el | 2 +- lisp/textmodes/rst.el | 2 +- lisp/textmodes/sgml-mode.el | 2 +- lisp/textmodes/spell.el | 2 +- lisp/textmodes/table.el | 2 +- lisp/textmodes/tex-mode.el | 2 +- lisp/textmodes/texinfmt.el | 2 +- lisp/textmodes/texinfo.el | 2 +- lisp/textmodes/texnfo-upd.el | 2 +- lisp/textmodes/text-mode.el | 2 +- lisp/textmodes/tildify.el | 2 +- lisp/textmodes/two-column.el | 2 +- lisp/textmodes/underline.el | 2 +- lisp/thingatpt.el | 2 +- lisp/thumbs.el | 2 +- lisp/time-stamp.el | 2 +- lisp/time.el | 2 +- lisp/timezone.el | 2 +- lisp/tmm.el | 2 +- lisp/tool-bar.el | 2 +- lisp/tooltip.el | 2 +- lisp/tree-widget.el | 2 +- lisp/tutorial.el | 2 +- lisp/type-break.el | 2 +- lisp/uniquify.el | 2 +- lisp/url/ChangeLog | 2 +- lisp/url/url-about.el | 2 +- lisp/url/url-auth.el | 2 +- lisp/url/url-cache.el | 2 +- lisp/url/url-cid.el | 2 +- lisp/url/url-cookie.el | 2 +- lisp/url/url-dav.el | 2 +- lisp/url/url-dired.el | 2 +- lisp/url/url-expand.el | 2 +- lisp/url/url-file.el | 2 +- lisp/url/url-ftp.el | 2 +- lisp/url/url-gw.el | 2 +- lisp/url/url-handlers.el | 2 +- lisp/url/url-history.el | 2 +- lisp/url/url-http.el | 2 +- lisp/url/url-imap.el | 2 +- lisp/url/url-irc.el | 2 +- lisp/url/url-ldap.el | 2 +- lisp/url/url-mailto.el | 2 +- lisp/url/url-methods.el | 2 +- lisp/url/url-misc.el | 2 +- lisp/url/url-news.el | 2 +- lisp/url/url-nfs.el | 2 +- lisp/url/url-ns.el | 2 +- lisp/url/url-parse.el | 2 +- lisp/url/url-privacy.el | 2 +- lisp/url/url-proxy.el | 2 +- lisp/url/url-util.el | 2 +- lisp/url/url-vars.el | 2 +- lisp/url/url.el | 2 +- lisp/userlock.el | 2 +- lisp/vc-annotate.el | 2 +- lisp/vc-arch.el | 2 +- lisp/vc-bzr.el | 2 +- lisp/vc-cvs.el | 2 +- lisp/vc-dav.el | 2 +- lisp/vc-dir.el | 2 +- lisp/vc-dispatcher.el | 2 +- lisp/vc-git.el | 2 +- lisp/vc-hg.el | 2 +- lisp/vc-hooks.el | 2 +- lisp/vc-mtn.el | 2 +- lisp/vc-rcs.el | 2 +- lisp/vc-sccs.el | 2 +- lisp/vc-svn.el | 2 +- lisp/vc.el | 2 +- lisp/vcursor.el | 2 +- lisp/view.el | 2 +- lisp/vt-control.el | 2 +- lisp/vt100-led.el | 2 +- lisp/w32-fns.el | 2 +- lisp/w32-vars.el | 2 +- lisp/wdired.el | 2 +- lisp/whitespace.el | 2 +- lisp/wid-browse.el | 2 +- lisp/wid-edit.el | 2 +- lisp/widget.el | 2 +- lisp/windmove.el | 2 +- lisp/window.el | 2 +- lisp/winner.el | 2 +- lisp/woman.el | 2 +- lisp/x-dnd.el | 2 +- lisp/xml.el | 2 +- lisp/xt-mouse.el | 2 +- lwlib/ChangeLog | 2 +- lwlib/Makefile.in | 2 +- lwlib/lwlib-Xaw.c | 2 +- lwlib/lwlib-Xlw.c | 2 +- lwlib/lwlib-Xm.c | 2 +- lwlib/lwlib-int.h | 2 +- lwlib/lwlib-utils.c | 2 +- lwlib/lwlib.c | 2 +- lwlib/lwlib.h | 2 +- lwlib/xlwmenu.c | 2 +- lwlib/xlwmenu.h | 2 +- lwlib/xlwmenuP.h | 2 +- make-dist | 2 +- msdos/ChangeLog | 2 +- msdos/INSTALL | 2 +- msdos/README | 4 ++-- msdos/mainmake | 2 +- msdos/mainmake.v2 | 2 +- msdos/sed1.inp | 2 +- msdos/sed1v2.inp | 2 +- msdos/sed2.inp | 2 +- msdos/sed2v2.inp | 2 +- msdos/sed2x.inp | 2 +- msdos/sed3.inp | 2 +- msdos/sed3v2.inp | 2 +- msdos/sed4.inp | 2 +- msdos/sed5x.inp | 2 +- msdos/sed6.inp | 2 +- msdos/sedalloc.inp | 2 +- msdos/sedleim.inp | 2 +- msdos/sedlisp.inp | 2 +- nextstep/ChangeLog | 2 +- nextstep/Cocoa/Emacs.base/Contents/Info.plist | 2 +- nextstep/INSTALL | 2 +- nextstep/README | 2 +- nt/ChangeLog | 2 +- nt/INSTALL | 2 +- nt/README | 2 +- nt/addpm.c | 2 +- nt/addsection.c | 2 +- nt/cmdproxy.c | 2 +- nt/config.nt | 2 +- nt/configure.bat | 2 +- nt/ddeclient.c | 2 +- nt/emacs.rc | 2 +- nt/emacsclient.rc | 2 +- nt/envadd.bat | 2 +- nt/gmake.defs | 2 +- nt/icons/README | 6 +++--- nt/inc/grp.h | 2 +- nt/inc/langinfo.h | 2 +- nt/inc/nl_types.h | 2 +- nt/inc/sys/socket.h | 2 +- nt/inc/sys/stat.h | 2 +- nt/makefile.w32-in | 2 +- nt/multi-install-info.bat | 2 +- nt/nmake.defs | 2 +- nt/paths.h | 2 +- nt/preprep.c | 2 +- nt/runemacs.c | 2 +- oldXMenu/Activate.c | 2 +- oldXMenu/ChangeLog | 2 +- oldXMenu/Create.c | 2 +- oldXMenu/FindSel.c | 2 +- oldXMenu/Internal.c | 2 +- oldXMenu/Makefile.in | 2 +- oldXMenu/insque.c | 2 +- src/.gdbinit | 2 +- src/ChangeLog | 2 +- src/ChangeLog.1 | 2 +- src/ChangeLog.10 | 2 +- src/ChangeLog.2 | 2 +- src/ChangeLog.3 | 2 +- src/ChangeLog.4 | 2 +- src/ChangeLog.5 | 2 +- src/ChangeLog.6 | 2 +- src/ChangeLog.7 | 2 +- src/ChangeLog.8 | 2 +- src/ChangeLog.9 | 2 +- src/Makefile.in | 2 +- src/README | 2 +- src/alloc.c | 2 +- src/atimer.c | 2 +- src/atimer.h | 2 +- src/blockinput.h | 2 +- src/buffer.c | 2 +- src/buffer.h | 2 +- src/bytecode.c | 2 +- src/callint.c | 2 +- src/callproc.c | 2 +- src/casefiddle.c | 2 +- src/casetab.c | 2 +- src/category.c | 2 +- src/ccl.c | 2 +- src/character.c | 4 ++-- src/charset.c | 2 +- src/charset.h | 2 +- src/cm.c | 2 +- src/cm.h | 2 +- src/cmds.c | 2 +- src/coding.c | 2 +- src/coding.h | 2 +- src/commands.h | 2 +- src/composite.c | 2 +- src/composite.h | 2 +- src/config.in | 2 +- src/data.c | 2 +- src/dbusbind.c | 2 +- src/dired.c | 2 +- src/dispextern.h | 2 +- src/dispnew.c | 2 +- src/disptab.h | 2 +- src/doc.c | 2 +- src/doprnt.c | 2 +- src/dosfns.c | 2 +- src/dosfns.h | 2 +- src/ecrt0.c | 2 +- src/editfns.c | 2 +- src/emacs-icon.h | 2 +- src/emacs.c | 2 +- src/epaths.in | 2 +- src/eval.c | 2 +- src/fileio.c | 2 +- src/filelock.c | 2 +- src/filemode.c | 2 +- src/firstfile.c | 2 +- src/floatfns.c | 2 +- src/fns.c | 2 +- src/font.c | 2 +- src/font.h | 2 +- src/fontset.c | 2 +- src/fontset.h | 2 +- src/frame.c | 2 +- src/frame.h | 2 +- src/fringe.c | 2 +- src/ftfont.c | 2 +- src/ftxfont.c | 2 +- src/getpagesize.h | 2 +- src/gtkutil.c | 2 +- src/gtkutil.h | 2 +- src/image.c | 2 +- src/indent.c | 2 +- src/indent.h | 2 +- src/insdel.c | 2 +- src/intervals.c | 2 +- src/intervals.h | 2 +- src/keyboard.c | 2 +- src/keyboard.h | 2 +- src/keymap.c | 2 +- src/keymap.h | 2 +- src/lastfile.c | 2 +- src/lisp.h | 2 +- src/lread.c | 2 +- src/m/alpha.h | 2 +- src/m/amdx86-64.h | 2 +- src/m/arm.h | 2 +- src/m/hp800.h | 2 +- src/m/ia64.h | 2 +- src/m/ibmrs6000.h | 2 +- src/m/ibms390.h | 2 +- src/m/ibms390x.h | 2 +- src/m/intel386.h | 2 +- src/m/iris4d.h | 2 +- src/m/m68k.h | 2 +- src/m/macppc.h | 2 +- src/m/mips.h | 2 +- src/m/sparc.h | 2 +- src/m/template.h | 2 +- src/m/vax.h | 2 +- src/macros.c | 2 +- src/macros.h | 2 +- src/makefile.w32-in | 2 +- src/marker.c | 2 +- src/mem-limits.h | 2 +- src/menu.c | 2 +- src/menu.h | 2 +- src/minibuf.c | 2 +- src/msdos.c | 2 +- src/msdos.h | 2 +- src/nsfns.m | 2 +- src/nsfont.m | 2 +- src/nsgui.h | 2 +- src/nsimage.m | 2 +- src/nsmenu.m | 2 +- src/nsselect.m | 2 +- src/nsterm.h | 2 +- src/nsterm.m | 2 +- src/prefix-args.c | 2 +- src/print.c | 2 +- src/process.c | 2 +- src/process.h | 2 +- src/puresize.h | 2 +- src/ralloc.c | 2 +- src/regex.c | 2 +- src/regex.h | 2 +- src/region-cache.c | 2 +- src/region-cache.h | 2 +- src/s/aix4-2.h | 2 +- src/s/bsd-common.h | 2 +- src/s/cygwin.h | 2 +- src/s/darwin.h | 2 +- src/s/freebsd.h | 2 +- src/s/gnu-linux.h | 2 +- src/s/gnu.h | 2 +- src/s/hpux10-20.h | 2 +- src/s/irix6-5.h | 2 +- src/s/lynxos.h | 2 +- src/s/ms-w32.h | 2 +- src/s/msdos.h | 2 +- src/s/netbsd.h | 2 +- src/s/sol2-3.h | 2 +- src/s/template.h | 2 +- src/s/usg5-4-2.h | 2 +- src/s/usg5-4.h | 2 +- src/scroll.c | 2 +- src/search.c | 2 +- src/sheap.c | 2 +- src/sound.c | 2 +- src/syntax.c | 2 +- src/syntax.h | 2 +- src/sysdep.c | 2 +- src/sysselect.h | 2 +- src/syssignal.h | 2 +- src/systime.h | 2 +- src/systty.h | 2 +- src/syswait.h | 2 +- src/term.c | 2 +- src/termchar.h | 2 +- src/termhooks.h | 2 +- src/terminal.c | 2 +- src/terminfo.c | 2 +- src/termopts.h | 2 +- src/textprop.c | 2 +- src/undo.c | 2 +- src/unexaix.c | 2 +- src/unexalpha.c | 2 +- src/unexcw.c | 2 +- src/unexec.c | 2 +- src/unexelf.c | 2 +- src/unexmacosx.c | 2 +- src/unexw32.c | 2 +- src/vm-limit.c | 2 +- src/w16select.c | 2 +- src/w32.c | 2 +- src/w32.h | 2 +- src/w32console.c | 2 +- src/w32fns.c | 2 +- src/w32font.c | 2 +- src/w32font.h | 2 +- src/w32gui.h | 2 +- src/w32heap.c | 2 +- src/w32heap.h | 2 +- src/w32inevt.c | 2 +- src/w32inevt.h | 2 +- src/w32menu.c | 2 +- src/w32proc.c | 2 +- src/w32reg.c | 2 +- src/w32select.c | 2 +- src/w32term.c | 2 +- src/w32term.h | 2 +- src/w32uniscribe.c | 2 +- src/w32xfns.c | 2 +- src/widget.c | 2 +- src/widget.h | 2 +- src/widgetprv.h | 2 +- src/window.c | 2 +- src/window.h | 2 +- src/xdisp.c | 2 +- src/xfaces.c | 2 +- src/xfns.c | 2 +- src/xfont.c | 2 +- src/xftfont.c | 2 +- src/xgselect.c | 2 +- src/xgselect.h | 2 +- src/xmenu.c | 2 +- src/xrdb.c | 2 +- src/xselect.c | 2 +- src/xsettings.c | 2 +- src/xsettings.h | 2 +- src/xsmfns.c | 2 +- src/xterm.c | 2 +- src/xterm.h | 2 +- test/ChangeLog | 2 +- test/bytecomp-testsuite.el | 2 +- test/cedet/cedet-utests.el | 2 +- test/cedet/ede-tests.el | 2 +- test/cedet/semantic-ia-utest.el | 2 +- test/cedet/semantic-tests.el | 2 +- test/cedet/semantic-utest-c.el | 2 +- test/cedet/semantic-utest.el | 2 +- test/cedet/srecode-tests.el | 2 +- test/cedet/tests/test.c | 2 +- test/cedet/tests/test.el | 2 +- test/cedet/tests/test.make | 2 +- test/cedet/tests/testdoublens.cpp | 2 +- test/cedet/tests/testdoublens.hpp | 2 +- test/cedet/tests/testjavacomp.java | 2 +- test/cedet/tests/testpolymorph.cpp | 2 +- test/cedet/tests/testspp.c | 2 +- test/cedet/tests/testsppreplace.c | 2 +- test/cedet/tests/testsppreplaced.c | 2 +- test/cedet/tests/testsubclass.cpp | 2 +- test/cedet/tests/testsubclass.hh | 2 +- test/cedet/tests/testtypedefs.cpp | 2 +- test/cedet/tests/testvarnames.c | 2 +- test/icalendar-testsuite.el | 2 +- test/newsticker-testsuite.el | 2 +- test/redisplay-testsuite.el | 2 +- update-subdirs | 2 +- 2012 files changed, 2039 insertions(+), 2038 deletions(-) diff --git a/ChangeLog b/ChangeLog index e305cb7faa1..e25adc8db30 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7947,7 +7947,7 @@ ;; End: Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002, - 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. + 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/INSTALL b/INSTALL index e19749e3ded..8f06673d617 100644 --- a/INSTALL +++ b/INSTALL @@ -1,6 +1,6 @@ GNU Emacs Installation Guide Copyright (C) 1992, 1994, 1996, 1997, 2000, 2001, 2002, 2003, 2004, - 2005, 2006, 2007, 2008, 2009, 2010, 2011 + 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. See the end of the file for license conditions. diff --git a/INSTALL.BZR b/INSTALL.BZR index f31a2e4b5b4..efe02d7c24b 100644 --- a/INSTALL.BZR +++ b/INSTALL.BZR @@ -1,4 +1,4 @@ -Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. See the end of the file for license conditions. diff --git a/Makefile.in b/Makefile.in index 32a09ff7842..5e0d128560d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -3,7 +3,7 @@ # DIST: that first. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -# 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +# 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 # Free Software Foundation, Inc. # This file is part of GNU Emacs. diff --git a/README b/README index efb8fb99a38..4b7610da62b 100644 --- a/README +++ b/README @@ -1,5 +1,5 @@ Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, - 2010, 2011 Free Software Foundation, Inc. + 2010, 2011, 2012 Free Software Foundation, Inc. See the end of the file for license conditions. diff --git a/admin/ChangeLog b/admin/ChangeLog index 39a8a8f57d5..1ff29e58254 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog @@ -877,7 +877,7 @@ ;; End: Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, - 2010, 2011 Free Software Foundation, Inc. + 2010, 2011, 2012 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/admin/README b/admin/README index 17232f5f3a5..3f85d475d7c 100644 --- a/admin/README +++ b/admin/README @@ -1,5 +1,5 @@ Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, - 2010, 2011 Free Software Foundation, Inc. + 2010, 2011, 2012 Free Software Foundation, Inc. See the end of the file for license conditions. diff --git a/admin/admin.el b/admin/admin.el index b792287596b..31dc74891ed 100644 --- a/admin/admin.el +++ b/admin/admin.el @@ -1,7 +1,7 @@ ;;; admin.el --- utilities for Emacs administration ;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, -;; 2010, 2011 Free Software Foundation, Inc. +;; 2010, 2011, 2012 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/admin/alloc-colors.c b/admin/alloc-colors.c index 38312604248..784e4c17dd9 100644 --- a/admin/alloc-colors.c +++ b/admin/alloc-colors.c @@ -1,5 +1,5 @@ /* Allocate X colors. Used for testing with dense colormaps. - Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 + Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/admin/build-configs b/admin/build-configs index 759750f8475..5679bce2d1a 100755 --- a/admin/build-configs +++ b/admin/build-configs @@ -1,7 +1,7 @@ #! /usr/bin/perl # Build Emacs in several different configurations. -# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 # Free Software Foundation, Inc. # This file is part of GNU Emacs. diff --git a/admin/charsets/mapfiles/README b/admin/charsets/mapfiles/README index a47c5d7b733..62e768fa4d6 100644 --- a/admin/charsets/mapfiles/README +++ b/admin/charsets/mapfiles/README @@ -1,4 +1,4 @@ -Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc. +Copyright (C) 2009, 2010, 2011, 2012 Free Software Foundation, Inc. Copyright (C) 2009, 2010, 2011 National Institute of Advanced Industrial Science and Technology (AIST) Registration Number H13PRO009 diff --git a/admin/cus-test.el b/admin/cus-test.el index 060e100f6c4..0b921f24783 100644 --- a/admin/cus-test.el +++ b/admin/cus-test.el @@ -1,6 +1,6 @@ ;;; cus-test.el --- tests for custom types and load problems -;; Copyright (C) 1998, 2000, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +;; Copyright (C) 1998, 2000, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 ;; Free Software Foundation, Inc. ;; Author: Markus Rost diff --git a/admin/diff-tar-files b/admin/diff-tar-files index 92198bad892..3be05de01c3 100755 --- a/admin/diff-tar-files +++ b/admin/diff-tar-files @@ -1,6 +1,6 @@ #! /bin/sh -# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 # Free Software Foundation, Inc. # This file is part of GNU Emacs. diff --git a/admin/make-announcement b/admin/make-announcement index 180c35601b3..41fe5dc99b6 100755 --- a/admin/make-announcement +++ b/admin/make-announcement @@ -1,7 +1,7 @@ #! /bin/bash ## Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, -## 2010, 2011 Free Software Foundation, Inc. +## 2010, 2011, 2012 Free Software Foundation, Inc. ## Author: Francesco Potorti` diff --git a/admin/make-emacs b/admin/make-emacs index 9abfa731be5..03876fff568 100755 --- a/admin/make-emacs +++ b/admin/make-emacs @@ -2,7 +2,7 @@ # Build Emacs with various options for profiling, debugging, # with and without warnings enabled etc. -# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 # Free Software Foundation, Inc. # This file is part of GNU Emacs. diff --git a/admin/notes/copyright b/admin/notes/copyright index 81736e038b6..5d0a77b5c43 100644 --- a/admin/notes/copyright +++ b/admin/notes/copyright @@ -1,4 +1,4 @@ -Copyright (C) 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. See the end of the file for license conditions. diff --git a/admin/notes/font-backend b/admin/notes/font-backend index d35102d681e..3b7f35314d9 100644 --- a/admin/notes/font-backend +++ b/admin/notes/font-backend @@ -1,4 +1,4 @@ -Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. See the end of the file for license conditions. diff --git a/admin/notes/lel-TODO b/admin/notes/lel-TODO index f38f9641c58..60600e4a936 100644 --- a/admin/notes/lel-TODO +++ b/admin/notes/lel-TODO @@ -1,6 +1,6 @@ Some lisp/emacs-lisp/ Features and Where They Are Documented -Copyright (C) 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. See the end of the file for license conditions. diff --git a/admin/notes/multi-tty b/admin/notes/multi-tty index 1dfc56f7a10..9db2c696b53 100644 --- a/admin/notes/multi-tty +++ b/admin/notes/multi-tty @@ -1,6 +1,6 @@ -*- coding: utf-8; mode: text; -*- -Copyright (C) 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. See the end of the file for license conditions. From README.multi-tty in the multi-tty branch. diff --git a/admin/notes/unicode b/admin/notes/unicode index 2ef9baf11b1..e453de698f1 100644 --- a/admin/notes/unicode +++ b/admin/notes/unicode @@ -1,6 +1,6 @@ -*-mode: text; coding: latin-1;-*- -Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. See the end of the file for license conditions. diff --git a/admin/nt/README-UNDUMP.W32 b/admin/nt/README-UNDUMP.W32 index e5dad487e13..f98732720cb 100644 --- a/admin/nt/README-UNDUMP.W32 +++ b/admin/nt/README-UNDUMP.W32 @@ -1,4 +1,4 @@ -Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. See the end of the file for license conditions. diff --git a/admin/nt/README-ftp-server b/admin/nt/README-ftp-server index eab757148d8..24806591be8 100644 --- a/admin/nt/README-ftp-server +++ b/admin/nt/README-ftp-server @@ -1,4 +1,4 @@ -Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. See the end of the file for license conditions. diff --git a/admin/nt/README.W32 b/admin/nt/README.W32 index 600e2c31d12..efc6aca7485 100644 --- a/admin/nt/README.W32 +++ b/admin/nt/README.W32 @@ -1,4 +1,4 @@ -Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. See the end of the file for license conditions. diff --git a/admin/nt/makedist.bat b/admin/nt/makedist.bat index 31361e53e5e..68b2b1f5b14 100755 --- a/admin/nt/makedist.bat +++ b/admin/nt/makedist.bat @@ -1,6 +1,6 @@ @echo off -rem Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +rem Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 rem Free Software Foundation, Inc. rem Cannot use brackets in andrewi's email below because diff --git a/admin/quick-install-emacs b/admin/quick-install-emacs index 1ad9c28aae2..1736b9c24df 100755 --- a/admin/quick-install-emacs +++ b/admin/quick-install-emacs @@ -1,7 +1,7 @@ #!/bin/sh ### quick-install-emacs --- do a halfway-decent job of installing emacs quickly -## Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +## Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 ## Free Software Foundation, Inc. ## Author: Miles Bader diff --git a/config.bat b/config.bat index e1d9f1b77b8..079e89a63da 100644 --- a/config.bat +++ b/config.bat @@ -2,7 +2,7 @@ rem ---------------------------------------------------------------------- rem Configuration script for MSDOS rem Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002, 2003 -rem 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +rem 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. rem This file is part of GNU Emacs. diff --git a/configure.in b/configure.in index bc83bc6d703..a43b514b60a 100644 --- a/configure.in +++ b/configure.in @@ -4,7 +4,7 @@ dnl autoconf dnl in the directory containing this script. dnl dnl Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2003, -dnl 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +dnl 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. dnl dnl This file is part of GNU Emacs. dnl @@ -2757,7 +2757,7 @@ fi AH_TOP([/* GNU Emacs site configuration template file. Copyright (C) 1988, 1993, 1994, 1999, 2000, 2001, 2002, 2004, 2005, - 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. + 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index 5196706f6c9..a19a2e6c63e 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -7428,7 +7428,7 @@ ;; End: Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002, - 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 + 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/doc/emacs/Makefile.in b/doc/emacs/Makefile.in index 3f2f635dc7c..09986ecab09 100644 --- a/doc/emacs/Makefile.in +++ b/doc/emacs/Makefile.in @@ -1,7 +1,7 @@ #### Makefile for the Emacs Manual # Copyright (C) 1994, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, -# 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +# 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. # This file is part of GNU Emacs. diff --git a/doc/emacs/abbrevs.texi b/doc/emacs/abbrevs.texi index 160c70471dd..c67645fc52a 100644 --- a/doc/emacs/abbrevs.texi +++ b/doc/emacs/abbrevs.texi @@ -1,6 +1,6 @@ @c This is part of the Emacs manual. @c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2001, 2002, 2003, -@c 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +@c 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @node Abbrevs @chapter Abbrevs diff --git a/doc/emacs/ack.texi b/doc/emacs/ack.texi index ff76beb3496..079f1d94298 100644 --- a/doc/emacs/ack.texi +++ b/doc/emacs/ack.texi @@ -1,6 +1,6 @@ @c This is part of the Emacs manual. @c Copyright (C) 1994, 1995, 1996, 1997, 1999, 2000, 2001, 2002, 2003, -@c 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +@c 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 @c Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @c diff --git a/doc/emacs/anti.texi b/doc/emacs/anti.texi index fd54aea4eb2..9de2ddf91c2 100644 --- a/doc/emacs/anti.texi +++ b/doc/emacs/anti.texi @@ -1,5 +1,5 @@ @c This is part of the Emacs manual. -@c Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +@c Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @node Antinews, Mac OS / GNUstep, X Resources, Top diff --git a/doc/emacs/arevert-xtra.texi b/doc/emacs/arevert-xtra.texi index c19fd3a5cc8..edca8a717db 100644 --- a/doc/emacs/arevert-xtra.texi +++ b/doc/emacs/arevert-xtra.texi @@ -1,5 +1,5 @@ @c This is part of the Emacs manual. -@c Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +@c Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 @c Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @c diff --git a/doc/emacs/basic.texi b/doc/emacs/basic.texi index abe6081a335..f5782c8f61f 100644 --- a/doc/emacs/basic.texi +++ b/doc/emacs/basic.texi @@ -1,6 +1,6 @@ @c This is part of the Emacs manual. @c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2000, 2001, -@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 @c Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @node Basic, Minibuffer, Exiting, Top diff --git a/doc/emacs/buffers.texi b/doc/emacs/buffers.texi index 7cee61db71e..894078ee040 100644 --- a/doc/emacs/buffers.texi +++ b/doc/emacs/buffers.texi @@ -1,6 +1,6 @@ @c This is part of the Emacs manual. @c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2000, 2001, -@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 @c Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @node Buffers, Windows, Files, Top diff --git a/doc/emacs/building.texi b/doc/emacs/building.texi index bad64b4c697..7248d5860d9 100644 --- a/doc/emacs/building.texi +++ b/doc/emacs/building.texi @@ -1,6 +1,6 @@ @c This is part of the Emacs manual. @c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2000, 2001, -@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 @c Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @node Building, Maintaining, Programs, Top diff --git a/doc/emacs/cal-xtra.texi b/doc/emacs/cal-xtra.texi index 2f6a09ba672..4cf898da1e0 100644 --- a/doc/emacs/cal-xtra.texi +++ b/doc/emacs/cal-xtra.texi @@ -1,5 +1,5 @@ @c This is part of the Emacs manual. -@c Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +@c Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 @c Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @c diff --git a/doc/emacs/calendar.texi b/doc/emacs/calendar.texi index 94d1042bb86..721a18605fe 100644 --- a/doc/emacs/calendar.texi +++ b/doc/emacs/calendar.texi @@ -1,6 +1,6 @@ @c This is part of the Emacs manual. @c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2000, 2001, -@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 @c Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @node Calendar/Diary, Document View, Dired, Top diff --git a/doc/emacs/cmdargs.texi b/doc/emacs/cmdargs.texi index 40cce49e20d..8387797872f 100644 --- a/doc/emacs/cmdargs.texi +++ b/doc/emacs/cmdargs.texi @@ -1,6 +1,6 @@ @c This is part of the Emacs manual. @c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2001, 2002, -@c 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +@c 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @node Emacs Invocation, X Resources, GNU Free Documentation License, Top @appendix Command Line Arguments for Emacs Invocation diff --git a/doc/emacs/commands.texi b/doc/emacs/commands.texi index 8d7e2556ddd..f14bbbe966e 100644 --- a/doc/emacs/commands.texi +++ b/doc/emacs/commands.texi @@ -1,6 +1,6 @@ @c This is part of the Emacs manual. @c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2001, 2002, -@c 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +@c 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @iftex @chapter Characters, Keys and Commands diff --git a/doc/emacs/custom.texi b/doc/emacs/custom.texi index 6a95e7a9ea5..11fc356008d 100644 --- a/doc/emacs/custom.texi +++ b/doc/emacs/custom.texi @@ -1,6 +1,6 @@ @c This is part of the Emacs manual. @c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2000, 2001, -@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 @c Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @node Customization, Quitting, Amusements, Top diff --git a/doc/emacs/dired-xtra.texi b/doc/emacs/dired-xtra.texi index aa2e83f129d..fd24c8db03f 100644 --- a/doc/emacs/dired-xtra.texi +++ b/doc/emacs/dired-xtra.texi @@ -1,5 +1,5 @@ @c This is part of the Emacs manual. -@c Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +@c Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 @c Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @c diff --git a/doc/emacs/dired.texi b/doc/emacs/dired.texi index 0b3cd7aac0e..b05be0b3ae4 100644 --- a/doc/emacs/dired.texi +++ b/doc/emacs/dired.texi @@ -1,6 +1,6 @@ @c This is part of the Emacs manual. @c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2000, 2001, -@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 @c Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @node Dired, Calendar/Diary, Rmail, Top diff --git a/doc/emacs/display.texi b/doc/emacs/display.texi index e4841c66e72..b2e0d2038c1 100644 --- a/doc/emacs/display.texi +++ b/doc/emacs/display.texi @@ -1,6 +1,6 @@ @c This is part of the Emacs manual. @c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2000, 2001, -@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 @c Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. diff --git a/doc/emacs/emacs-xtra.texi b/doc/emacs/emacs-xtra.texi index 9d20b335355..0214eaf106f 100644 --- a/doc/emacs/emacs-xtra.texi +++ b/doc/emacs/emacs-xtra.texi @@ -11,7 +11,7 @@ @copying This manual describes specialized features of Emacs. -Copyright @copyright{} 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +Copyright @copyright{} 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @quotation diff --git a/doc/emacs/emacs.texi b/doc/emacs/emacs.texi index f839266b918..5f8a9b5b096 100644 --- a/doc/emacs/emacs.texi +++ b/doc/emacs/emacs.texi @@ -13,7 +13,7 @@ updated for Emacs version @value{EMACSVER}. Copyright @copyright{} 1985, 1986, 1987, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, -2010, 2011 Free Software Foundation, Inc. +2010, 2011, 2012 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/emacs/emerge-xtra.texi b/doc/emacs/emerge-xtra.texi index 5db2d2b4a2a..300d418e4d6 100644 --- a/doc/emacs/emerge-xtra.texi +++ b/doc/emacs/emerge-xtra.texi @@ -1,5 +1,5 @@ @c This is part of the Emacs manual. -@c Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +@c Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 @c Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @c diff --git a/doc/emacs/entering.texi b/doc/emacs/entering.texi index 349e6326ec1..371d4c36a18 100644 --- a/doc/emacs/entering.texi +++ b/doc/emacs/entering.texi @@ -1,6 +1,6 @@ @c This is part of the Emacs manual. @c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 2001, 2002, 2003, -@c 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +@c 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @iftex @chapter Entering and Exiting Emacs diff --git a/doc/emacs/files.texi b/doc/emacs/files.texi index b5e3bff6791..a2a09cea11e 100644 --- a/doc/emacs/files.texi +++ b/doc/emacs/files.texi @@ -1,6 +1,6 @@ @c This is part of the Emacs manual. @c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 1999, 2000, -@c 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +@c 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 @c Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @node Files, Buffers, Keyboard Macros, Top diff --git a/doc/emacs/fixit.texi b/doc/emacs/fixit.texi index 113e39cfd1a..a0806ed4a34 100644 --- a/doc/emacs/fixit.texi +++ b/doc/emacs/fixit.texi @@ -1,6 +1,6 @@ @c This is part of the Emacs manual. @c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2001, 2002, -@c 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +@c 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @node Fixit, Keyboard Macros, Search, Top @chapter Commands for Fixing Typos diff --git a/doc/emacs/fortran-xtra.texi b/doc/emacs/fortran-xtra.texi index fdf6733d26b..81a0f84c2de 100644 --- a/doc/emacs/fortran-xtra.texi +++ b/doc/emacs/fortran-xtra.texi @@ -1,5 +1,5 @@ @c This is part of the Emacs manual. -@c Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +@c Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 @c Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @c diff --git a/doc/emacs/frames.texi b/doc/emacs/frames.texi index 42398766169..e77f93e3964 100644 --- a/doc/emacs/frames.texi +++ b/doc/emacs/frames.texi @@ -1,6 +1,6 @@ @c This is part of the Emacs manual. @c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 1999, 2000, -@c 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +@c 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 @c Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @node Frames, International, Windows, Top diff --git a/doc/emacs/glossary.texi b/doc/emacs/glossary.texi index d75673c65d3..412ea908ba9 100644 --- a/doc/emacs/glossary.texi +++ b/doc/emacs/glossary.texi @@ -1,6 +1,6 @@ @c This is part of the Emacs manual. @c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2001, 2002, -@c 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +@c 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @node Glossary, Key Index, Intro, Top @unnumbered Glossary diff --git a/doc/emacs/gnu.texi b/doc/emacs/gnu.texi index 7f5bef785f0..47e02f85acc 100644 --- a/doc/emacs/gnu.texi +++ b/doc/emacs/gnu.texi @@ -1,5 +1,5 @@ @c Copyright (C) 1985, 1986, 1987, 1993, 1995, 2001, 2002, 2003, 2004, -@c 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +@c 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @c @c Permission is granted to anyone to make or distribute verbatim copies @c of this document, in any medium, provided that the copyright notice and diff --git a/doc/emacs/help.texi b/doc/emacs/help.texi index d55159ed832..0aede9127d4 100644 --- a/doc/emacs/help.texi +++ b/doc/emacs/help.texi @@ -1,6 +1,6 @@ @c This is part of the Emacs manual. @c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2000, 2001, -@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 @c Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @node Help, Mark, M-x, Top diff --git a/doc/emacs/indent.texi b/doc/emacs/indent.texi index 86e15605edc..3be1be907ec 100644 --- a/doc/emacs/indent.texi +++ b/doc/emacs/indent.texi @@ -1,6 +1,6 @@ @c This is part of the Emacs manual. @c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2001, 2002, -@c 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +@c 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @node Indentation, Text, Major Modes, Top @chapter Indentation diff --git a/doc/emacs/killing.texi b/doc/emacs/killing.texi index 2ad3bc9e739..fd1269eab59 100644 --- a/doc/emacs/killing.texi +++ b/doc/emacs/killing.texi @@ -1,6 +1,6 @@ @c This is part of the Emacs manual. @c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2000, 2001, -@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 @c Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. diff --git a/doc/emacs/kmacro.texi b/doc/emacs/kmacro.texi index 6807c62049e..ccfc67f496c 100644 --- a/doc/emacs/kmacro.texi +++ b/doc/emacs/kmacro.texi @@ -1,6 +1,6 @@ @c This is part of the Emacs manual. @c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2000, 2001, -@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @node Keyboard Macros, Files, Fixit, Top @chapter Keyboard Macros diff --git a/doc/emacs/m-x.texi b/doc/emacs/m-x.texi index 3489bed0d8c..0052d677682 100644 --- a/doc/emacs/m-x.texi +++ b/doc/emacs/m-x.texi @@ -1,6 +1,6 @@ @c This is part of the Emacs manual. @c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2001, 2002, -@c 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +@c 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @node M-x, Help, Minibuffer, Top @chapter Running Commands by Name diff --git a/doc/emacs/macos.texi b/doc/emacs/macos.texi index c36efeaeaf4..bfefe8d3375 100644 --- a/doc/emacs/macos.texi +++ b/doc/emacs/macos.texi @@ -1,6 +1,6 @@ @c This is part of the Emacs manual. @c Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, -@c 2009, 2010, 2011 Free Software Foundation, Inc. +@c 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @node Mac OS / GNUstep, Microsoft Windows, Antinews, Top @appendix Emacs and Mac OS / GNUstep diff --git a/doc/emacs/maintaining.texi b/doc/emacs/maintaining.texi index f7be0015ffa..af9dcee819a 100644 --- a/doc/emacs/maintaining.texi +++ b/doc/emacs/maintaining.texi @@ -1,6 +1,6 @@ @c This is part of the Emacs manual. @c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 1999, 2000, -@c 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +@c 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 @c Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @node Maintaining, Abbrevs, Building, Top diff --git a/doc/emacs/major.texi b/doc/emacs/major.texi index 78fdbf6a96f..b3ff529cc91 100644 --- a/doc/emacs/major.texi +++ b/doc/emacs/major.texi @@ -1,6 +1,6 @@ @c This is part of the Emacs manual. @c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2000, 2001, -@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @node Major Modes, Indentation, International, Top @chapter Major Modes diff --git a/doc/emacs/makefile.w32-in b/doc/emacs/makefile.w32-in index 4013c2fca4b..fef00335a4c 100644 --- a/doc/emacs/makefile.w32-in +++ b/doc/emacs/makefile.w32-in @@ -1,6 +1,6 @@ #### -*- Makefile -*- for the Emacs Manual -# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 # Free Software Foundation, Inc. # This file is part of GNU Emacs. diff --git a/doc/emacs/mark.texi b/doc/emacs/mark.texi index 1b702273be6..9d1d6629f6c 100644 --- a/doc/emacs/mark.texi +++ b/doc/emacs/mark.texi @@ -1,6 +1,6 @@ @c This is part of the Emacs manual. @c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2001, 2002, -@c 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +@c 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 @c Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @node Mark, Killing, Help, Top diff --git a/doc/emacs/mini.texi b/doc/emacs/mini.texi index 975f22cd5e4..c3dd44c2260 100644 --- a/doc/emacs/mini.texi +++ b/doc/emacs/mini.texi @@ -1,6 +1,6 @@ @c This is part of the Emacs manual. @c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2000, 2001, -@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 @c Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @node Minibuffer, M-x, Basic, Top diff --git a/doc/emacs/misc.texi b/doc/emacs/misc.texi index e734fe64617..1c407c0423a 100644 --- a/doc/emacs/misc.texi +++ b/doc/emacs/misc.texi @@ -1,6 +1,6 @@ @c This is part of the Emacs manual. @c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2000, 2001, -@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 @c Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @iftex diff --git a/doc/emacs/msdog-xtra.texi b/doc/emacs/msdog-xtra.texi index 70ed3dde916..6ecc36db504 100644 --- a/doc/emacs/msdog-xtra.texi +++ b/doc/emacs/msdog-xtra.texi @@ -1,5 +1,5 @@ @c This is part of the Emacs manual. -@c Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +@c Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @c @c This file is included either in emacs-xtra.texi (when producing the diff --git a/doc/emacs/msdog.texi b/doc/emacs/msdog.texi index 25401932196..68565ba4387 100644 --- a/doc/emacs/msdog.texi +++ b/doc/emacs/msdog.texi @@ -1,6 +1,6 @@ @c This is part of the Emacs manual. @c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2000, 2001, -@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 @c Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @node Microsoft Windows, Manifesto, Mac OS / GNUstep, Top diff --git a/doc/emacs/mule.texi b/doc/emacs/mule.texi index 7f204890ce4..7195b842723 100644 --- a/doc/emacs/mule.texi +++ b/doc/emacs/mule.texi @@ -1,6 +1,6 @@ @c This is part of the Emacs manual. @c Copyright (C) 1997, 1999, 2000, 2001, 2002, 2003, 2004, -@c 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +@c 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @node International, Major Modes, Frames, Top @chapter International Character Set Support diff --git a/doc/emacs/picture-xtra.texi b/doc/emacs/picture-xtra.texi index 36254ea9993..c46127696bf 100644 --- a/doc/emacs/picture-xtra.texi +++ b/doc/emacs/picture-xtra.texi @@ -1,5 +1,5 @@ @c This is part of the Emacs manual. -@c Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +@c Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @c @c This file is included either in emacs-xtra.texi (when producing the diff --git a/doc/emacs/programs.texi b/doc/emacs/programs.texi index c2364fb8c0e..37318b2ae30 100644 --- a/doc/emacs/programs.texi +++ b/doc/emacs/programs.texi @@ -1,6 +1,6 @@ @c This is part of the Emacs manual. @c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 1999, 2000, -@c 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +@c 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 @c Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @node Programs, Building, Text, Top diff --git a/doc/emacs/regs.texi b/doc/emacs/regs.texi index 5eada94a0ab..79331b449ad 100644 --- a/doc/emacs/regs.texi +++ b/doc/emacs/regs.texi @@ -1,6 +1,6 @@ @c This is part of the Emacs manual. @c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2001, 2002, -@c 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +@c 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @node Registers, Display, CUA Bindings, Top @chapter Registers diff --git a/doc/emacs/rmail.texi b/doc/emacs/rmail.texi index 82e6b32cd88..b57f43853e5 100644 --- a/doc/emacs/rmail.texi +++ b/doc/emacs/rmail.texi @@ -1,6 +1,6 @@ @c This is part of the Emacs manual. @c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2001, 2002, -@c 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +@c 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 @c Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @node Rmail, Dired, Sending Mail, Top diff --git a/doc/emacs/screen.texi b/doc/emacs/screen.texi index f12c03e1abf..e721ffe2cc5 100644 --- a/doc/emacs/screen.texi +++ b/doc/emacs/screen.texi @@ -1,6 +1,6 @@ @c This is part of the Emacs manual. @c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2001, 2002, -@c 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +@c 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 @c Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @node Screen, User Input, Acknowledgments, Top diff --git a/doc/emacs/search.texi b/doc/emacs/search.texi index 2b96e519b10..029f6a19200 100644 --- a/doc/emacs/search.texi +++ b/doc/emacs/search.texi @@ -1,6 +1,6 @@ @c This is part of the Emacs manual. @c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2000, 2001, 2002, -@c 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +@c 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 @c Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @node Search, Fixit, Display, Top diff --git a/doc/emacs/sending.texi b/doc/emacs/sending.texi index 8dbe24856ab..218f0d8a1bc 100644 --- a/doc/emacs/sending.texi +++ b/doc/emacs/sending.texi @@ -1,6 +1,6 @@ @c This is part of the Emacs manual. @c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2000, 2001, 2002, -@c 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +@c 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 @c Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @node Sending Mail diff --git a/doc/emacs/text.texi b/doc/emacs/text.texi index e81bb4441e3..a82f4013a2c 100644 --- a/doc/emacs/text.texi +++ b/doc/emacs/text.texi @@ -1,6 +1,6 @@ @c This is part of the Emacs manual. @c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2000, 2001, -@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 @c Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @node Text, Programs, Indentation, Top diff --git a/doc/emacs/trouble.texi b/doc/emacs/trouble.texi index 6407467728f..638d238fb57 100644 --- a/doc/emacs/trouble.texi +++ b/doc/emacs/trouble.texi @@ -1,6 +1,6 @@ @c This is part of the Emacs manual. @c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2001, 2002, -@c 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +@c 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 @c Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @iftex diff --git a/doc/emacs/vc-xtra.texi b/doc/emacs/vc-xtra.texi index 89e84287499..f0384f74ee4 100644 --- a/doc/emacs/vc-xtra.texi +++ b/doc/emacs/vc-xtra.texi @@ -1,5 +1,5 @@ @c This is part of the Emacs manual. -@c Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +@c Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 @c Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @c diff --git a/doc/emacs/vc1-xtra.texi b/doc/emacs/vc1-xtra.texi index 668c3a4168b..cbf01483d63 100644 --- a/doc/emacs/vc1-xtra.texi +++ b/doc/emacs/vc1-xtra.texi @@ -1,5 +1,5 @@ @c This is part of the Emacs manual. -@c Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +@c Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 @c Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @c diff --git a/doc/emacs/windows.texi b/doc/emacs/windows.texi index a80e18360e2..125d9ccbf9d 100644 --- a/doc/emacs/windows.texi +++ b/doc/emacs/windows.texi @@ -1,6 +1,6 @@ @c This is part of the Emacs manual. @c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2000, 2001, -@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @node Windows, Frames, Buffers, Top @chapter Multiple Windows diff --git a/doc/emacs/xresources.texi b/doc/emacs/xresources.texi index 0c44b9f1817..d21ece224ba 100644 --- a/doc/emacs/xresources.texi +++ b/doc/emacs/xresources.texi @@ -1,6 +1,6 @@ @c This is part of the Emacs manual. @c Copyright (C) 1987, 1993, 1994, 1995, 1997, 2001, 2002, 2003, -@c 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +@c 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @c See file emacs.texi for copying conditions. @node X Resources, Antinews, Emacs Invocation, Top @appendix X Options and Resources diff --git a/doc/lispintro/ChangeLog b/doc/lispintro/ChangeLog index 70accbc0669..ae8b91c1be7 100644 --- a/doc/lispintro/ChangeLog +++ b/doc/lispintro/ChangeLog @@ -401,7 +401,7 @@ ;; End: Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, - 2008, 2009, 2010, 2011 Free Software Foundation, Inc. + 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/doc/lispintro/Makefile.in b/doc/lispintro/Makefile.in index e85185f060d..fe89fa6deab 100644 --- a/doc/lispintro/Makefile.in +++ b/doc/lispintro/Makefile.in @@ -1,7 +1,7 @@ #### Makefile for the Emacs Lisp Introduction manual # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002, 2003, -# 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +# 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. # This file is part of GNU Emacs. diff --git a/doc/lispintro/README b/doc/lispintro/README index 448682bfea7..c6e656f5a3e 100644 --- a/doc/lispintro/README +++ b/doc/lispintro/README @@ -1,4 +1,4 @@ -Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. See the end of the file for license conditions. diff --git a/doc/lispintro/cons-1.eps b/doc/lispintro/cons-1.eps index 13756346e4e..9216124153b 100644 --- a/doc/lispintro/cons-1.eps +++ b/doc/lispintro/cons-1.eps @@ -5,7 +5,7 @@ %%Creator: Tgif-2.16-p4 by William Chia-Wei Cheng (william@cs.UCLA.edu) % Copyright (C) 1995, 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007, -% 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +% 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. % % This file is part of GNU Emacs. % diff --git a/doc/lispintro/cons-2.eps b/doc/lispintro/cons-2.eps index 371ceb37e65..5641ffef638 100644 --- a/doc/lispintro/cons-2.eps +++ b/doc/lispintro/cons-2.eps @@ -5,7 +5,7 @@ %%Creator: Tgif-2.16-p4 by William Chia-Wei Cheng (william@cs.UCLA.edu) % Copyright (C) 1995, 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007, -% 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +% 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. % % This file is part of GNU Emacs. % diff --git a/doc/lispintro/cons-2a.eps b/doc/lispintro/cons-2a.eps index cd4ed67d23a..9665ee9031b 100644 --- a/doc/lispintro/cons-2a.eps +++ b/doc/lispintro/cons-2a.eps @@ -5,7 +5,7 @@ %%Creator: Tgif-2.16-p4 by William Chia-Wei Cheng (william@cs.UCLA.edu) % Copyright (C) 1995, 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007, -% 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +% 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. % % This file is part of GNU Emacs. % diff --git a/doc/lispintro/cons-3.eps b/doc/lispintro/cons-3.eps index c9b40f0e0cb..f20778fc5a1 100644 --- a/doc/lispintro/cons-3.eps +++ b/doc/lispintro/cons-3.eps @@ -5,7 +5,7 @@ %%Creator: Tgif-2.16-p4 by William Chia-Wei Cheng (william@cs.UCLA.edu) % Copyright (C) 1995, 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007, -% 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +% 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. % % This file is part of GNU Emacs. % diff --git a/doc/lispintro/cons-4.eps b/doc/lispintro/cons-4.eps index 83ce2bdd750..8db85b7edc3 100644 --- a/doc/lispintro/cons-4.eps +++ b/doc/lispintro/cons-4.eps @@ -5,7 +5,7 @@ %%Creator: Tgif-2.16-p4 by William Chia-Wei Cheng (william@cs.UCLA.edu) % Copyright (C) 1995, 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007, -% 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +% 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. % % This file is part of GNU Emacs. % diff --git a/doc/lispintro/cons-5.eps b/doc/lispintro/cons-5.eps index 7ad3d4800a9..00a3c7b953b 100644 --- a/doc/lispintro/cons-5.eps +++ b/doc/lispintro/cons-5.eps @@ -5,7 +5,7 @@ %%Creator: Tgif-2.16-p4 by William Chia-Wei Cheng (william@cs.UCLA.edu) % Copyright (C) 1995, 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007, -% 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +% 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. % % This file is part of GNU Emacs. % diff --git a/doc/lispintro/drawers.eps b/doc/lispintro/drawers.eps index 7b76b035459..36fe8213bb8 100644 --- a/doc/lispintro/drawers.eps +++ b/doc/lispintro/drawers.eps @@ -9,7 +9,7 @@ %%EndComments %%BeginProlog -% Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +% Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 % Free Software Foundation, Inc. % % This file is part of GNU Emacs. diff --git a/doc/lispintro/emacs-lisp-intro.texi b/doc/lispintro/emacs-lisp-intro.texi index 4cce412b225..c3cb93781f8 100644 --- a/doc/lispintro/emacs-lisp-intro.texi +++ b/doc/lispintro/emacs-lisp-intro.texi @@ -229,7 +229,7 @@ people who are not programmers. Edition @value{edition-number}, @value{update-date} @sp 1 Copyright @copyright{} 1990, 1991, 1992, 1993, 1994, 1995, 1997, 2001, - 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 + 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @sp 1 diff --git a/doc/lispintro/lambda-1.eps b/doc/lispintro/lambda-1.eps index 2f1197c0f91..1ced8306672 100644 --- a/doc/lispintro/lambda-1.eps +++ b/doc/lispintro/lambda-1.eps @@ -5,7 +5,7 @@ %%Creator: Tgif-2.16-p4 by William Chia-Wei Cheng (william@cs.UCLA.edu) % Copyright (C) 1995, 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007, -% 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +% 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. % % This file is part of GNU Emacs. % diff --git a/doc/lispintro/lambda-2.eps b/doc/lispintro/lambda-2.eps index 84042f5df04..da24273cac5 100644 --- a/doc/lispintro/lambda-2.eps +++ b/doc/lispintro/lambda-2.eps @@ -5,7 +5,7 @@ %%Creator: Tgif-2.16-p4 by William Chia-Wei Cheng (william@cs.UCLA.edu) % Copyright (C) 1995, 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007, -% 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +% 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. % % This file is part of GNU Emacs. % diff --git a/doc/lispintro/lambda-3.eps b/doc/lispintro/lambda-3.eps index 8ba7da2d4f1..248d77b541f 100644 --- a/doc/lispintro/lambda-3.eps +++ b/doc/lispintro/lambda-3.eps @@ -5,7 +5,7 @@ %%Creator: Tgif-2.16-p4 by William Chia-Wei Cheng (william@cs.UCLA.edu) % Copyright (C) 1995, 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007, -% 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +% 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. % % This file is part of GNU Emacs. % diff --git a/doc/lispintro/makefile.w32-in b/doc/lispintro/makefile.w32-in index 8c7c5eb0527..c50012c3866 100644 --- a/doc/lispintro/makefile.w32-in +++ b/doc/lispintro/makefile.w32-in @@ -1,6 +1,6 @@ #### -*- Makefile -*- for the Emacs Lisp Introduction manual. -# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 # Free Software Foundation, Inc. # This file is part of GNU Emacs. diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index 51143c27859..6e9f849714e 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -8811,7 +8811,7 @@ ;; End: Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, - 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. + 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/doc/lispref/Makefile.in b/doc/lispref/Makefile.in index f4cd5940045..80382a1ab89 100644 --- a/doc/lispref/Makefile.in +++ b/doc/lispref/Makefile.in @@ -1,7 +1,7 @@ # Makefile for the GNU Emacs Lisp Reference Manual. # Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, -# 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +# 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 # Free Software Foundation, Inc. # This file is part of GNU Emacs. diff --git a/doc/lispref/README b/doc/lispref/README index 8587246194a..26fc84c45eb 100644 --- a/doc/lispref/README +++ b/doc/lispref/README @@ -1,4 +1,4 @@ -Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. See the end of the file for license conditions. diff --git a/doc/lispref/abbrevs.texi b/doc/lispref/abbrevs.texi index dcc3c57663b..ddad5ad4b04 100644 --- a/doc/lispref/abbrevs.texi +++ b/doc/lispref/abbrevs.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1999, 2001, 2002, 2003, -@c 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +@c 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../../info/abbrevs @node Abbrevs, Processes, Syntax Tables, Top diff --git a/doc/lispref/advice.texi b/doc/lispref/advice.texi index 544a6a211eb..e4bcd62fbc6 100644 --- a/doc/lispref/advice.texi +++ b/doc/lispref/advice.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1998, 1999, 2001, 2002, 2003, 2004, -@c 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +@c 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../../info/advising @node Advising Functions, Debugging, Byte Compilation, Top diff --git a/doc/lispref/anti.texi b/doc/lispref/anti.texi index 5b8397e7e3e..e0dd7b7ae35 100644 --- a/doc/lispref/anti.texi +++ b/doc/lispref/anti.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1999, 2002, 2003, 2004, 2005, 2006, 2007, 2008, -@c 2009, 2010, 2011 Free Software Foundation, Inc. +@c 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @c This node must have no pointers. diff --git a/doc/lispref/back.texi b/doc/lispref/back.texi index 373da7b1e12..e408413e33e 100644 --- a/doc/lispref/back.texi +++ b/doc/lispref/back.texi @@ -1,6 +1,6 @@ \input texinfo @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +@c Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 @c Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @c diff --git a/doc/lispref/backups.texi b/doc/lispref/backups.texi index e196ce03962..17e18dba062 100644 --- a/doc/lispref/backups.texi +++ b/doc/lispref/backups.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1999, 2001, 2002, 2003, -@c 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +@c 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../../info/backups @node Backups and Auto-Saving, Buffers, Files, Top diff --git a/doc/lispref/buffers.texi b/doc/lispref/buffers.texi index 98fb748cd36..8d432f8905d 100644 --- a/doc/lispref/buffers.texi +++ b/doc/lispref/buffers.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2001, 2002, -@c 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +@c 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../../info/buffers @node Buffers, Windows, Backups and Auto-Saving, Top diff --git a/doc/lispref/commands.texi b/doc/lispref/commands.texi index 91aae9594bb..b32c4e52371 100644 --- a/doc/lispref/commands.texi +++ b/doc/lispref/commands.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2001, 2002, -@c 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +@c 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 @c Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../../info/commands diff --git a/doc/lispref/compile.texi b/doc/lispref/compile.texi index b91e1626233..d06c38f44b8 100644 --- a/doc/lispref/compile.texi +++ b/doc/lispref/compile.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 2001, 2002, 2003, 2004, -@c 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +@c 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../../info/compile @node Byte Compilation, Advising Functions, Loading, Top diff --git a/doc/lispref/control.texi b/doc/lispref/control.texi index f3da3ccd341..59726912295 100644 --- a/doc/lispref/control.texi +++ b/doc/lispref/control.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2001, 2002, -@c 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +@c 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../../info/control @node Control Structures, Variables, Evaluation, Top diff --git a/doc/lispref/customize.texi b/doc/lispref/customize.texi index 52d8fa42389..fb0fd3bead3 100644 --- a/doc/lispref/customize.texi +++ b/doc/lispref/customize.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -@c 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +@c 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../../info/customize @node Customization, Loading, Macros, Top diff --git a/doc/lispref/debugging.texi b/doc/lispref/debugging.texi index 13ebbabbb9a..a9448f1c876 100644 --- a/doc/lispref/debugging.texi +++ b/doc/lispref/debugging.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1998, 1999, 2001, 2002, 2003, -@c 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +@c 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../../info/debugging @node Debugging, Read and Print, Advising Functions, Top diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi index 42f68583839..1a9ee5235a3 100644 --- a/doc/lispref/display.texi +++ b/doc/lispref/display.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2000, 2001, -@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 @c Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../../info/display diff --git a/doc/lispref/edebug.texi b/doc/lispref/edebug.texi index cd2c128696d..40a9f29db51 100644 --- a/doc/lispref/edebug.texi +++ b/doc/lispref/edebug.texi @@ -1,7 +1,7 @@ @comment -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1992, 1993, 1994, 1998, 1999, 2001, 2002, 2003, 2004, -@c 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +@c 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @c This file can also be used by an independent Edebug User diff --git a/doc/lispref/elisp-covers.texi b/doc/lispref/elisp-covers.texi index f7d1eaae028..d37c3126a0b 100644 --- a/doc/lispref/elisp-covers.texi +++ b/doc/lispref/elisp-covers.texi @@ -1,6 +1,6 @@ \input texinfo @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +@c Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 @c Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @c diff --git a/doc/lispref/elisp.texi b/doc/lispref/elisp.texi index d0297032f03..92ee8590b77 100644 --- a/doc/lispref/elisp.texi +++ b/doc/lispref/elisp.texi @@ -45,7 +45,7 @@ This is edition @value{VERSION} of the GNU Emacs Lisp Reference Manual,@* corresponding to Emacs version @value{EMACSVER}. Copyright @copyright{} 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1998, -1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @quotation diff --git a/doc/lispref/errors.texi b/doc/lispref/errors.texi index 1ec1029b96d..527c3306696 100644 --- a/doc/lispref/errors.texi +++ b/doc/lispref/errors.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1990, 1991, 1992, 1993, 1999, 2001, 2002, 2003, 2004, -@c 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +@c 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../../info/errors @node Standard Errors, Standard Buffer-Local Variables, GNU Emacs Internals, Top diff --git a/doc/lispref/eval.texi b/doc/lispref/eval.texi index d5d271c1ad6..1e10b97315d 100644 --- a/doc/lispref/eval.texi +++ b/doc/lispref/eval.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1998, 2001, 2002, 2003, -@c 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +@c 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../../info/eval @node Evaluation, Control Structures, Symbols, Top diff --git a/doc/lispref/files.texi b/doc/lispref/files.texi index e2560c2abf6..ab67e94fb6f 100644 --- a/doc/lispref/files.texi +++ b/doc/lispref/files.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2001, -@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 @c Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../../info/files diff --git a/doc/lispref/frames.texi b/doc/lispref/frames.texi index 0c81718750a..eca5c7306f8 100644 --- a/doc/lispref/frames.texi +++ b/doc/lispref/frames.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2001, -@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 @c Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../../info/frames diff --git a/doc/lispref/functions.texi b/doc/lispref/functions.texi index 198cc1a1ae6..c61a6cc9345 100644 --- a/doc/lispref/functions.texi +++ b/doc/lispref/functions.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2001, -@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 @c Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../../info/functions diff --git a/doc/lispref/hash.texi b/doc/lispref/hash.texi index 82c172c753e..c057bc53f79 100644 --- a/doc/lispref/hash.texi +++ b/doc/lispref/hash.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, -@c 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +@c 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../../info/hash @node Hash Tables, Symbols, Sequences Arrays Vectors, Top diff --git a/doc/lispref/help.texi b/doc/lispref/help.texi index f1db33582ff..eb8d24cba63 100644 --- a/doc/lispref/help.texi +++ b/doc/lispref/help.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2001, -@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../../info/help @node Documentation, Files, Modes, Top diff --git a/doc/lispref/hooks.texi b/doc/lispref/hooks.texi index c76634be453..4fdbea891dc 100644 --- a/doc/lispref/hooks.texi +++ b/doc/lispref/hooks.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1990, 1991, 1992, 1993, 1998, 2001, 2002, 2003, 2004, -@c 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +@c 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../../info/hooks @node Standard Hooks, Index, Standard Keymaps, Top diff --git a/doc/lispref/internals.texi b/doc/lispref/internals.texi index 4f18c718576..0452fb6fc99 100644 --- a/doc/lispref/internals.texi +++ b/doc/lispref/internals.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1990, 1991, 1992, 1993, 1998, 1999, 2001, 2002, 2003, -@c 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +@c 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../../info/internals @node GNU Emacs Internals, Standard Errors, Tips, Top diff --git a/doc/lispref/intro.texi b/doc/lispref/intro.texi index 881ae942236..5ea45bea6ed 100644 --- a/doc/lispref/intro.texi +++ b/doc/lispref/intro.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 2001, 2002, 2003, 2004, -@c 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +@c 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../../info/intro diff --git a/doc/lispref/keymaps.texi b/doc/lispref/keymaps.texi index 5befa9136dd..5e20bb4f253 100644 --- a/doc/lispref/keymaps.texi +++ b/doc/lispref/keymaps.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1998, 1999, 2000, 2001, -@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 @c Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../../info/keymaps diff --git a/doc/lispref/lay-flat.texi b/doc/lispref/lay-flat.texi index 56e6c47990e..53e80b94299 100644 --- a/doc/lispref/lay-flat.texi +++ b/doc/lispref/lay-flat.texi @@ -1,6 +1,6 @@ \input texinfo @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. -@c Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +@c Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 @c Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @c diff --git a/doc/lispref/lists.texi b/doc/lispref/lists.texi index 383023401ae..990ea05f61c 100644 --- a/doc/lispref/lists.texi +++ b/doc/lispref/lists.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2001, -@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../../info/lists @node Lists, Sequences Arrays Vectors, Strings and Characters, Top diff --git a/doc/lispref/loading.texi b/doc/lispref/loading.texi index ca06f847fb9..c9e297b429c 100644 --- a/doc/lispref/loading.texi +++ b/doc/lispref/loading.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2001, -@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 @c Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../../info/loading diff --git a/doc/lispref/locals.texi b/doc/lispref/locals.texi index b35c43c7b42..f685d13c94e 100644 --- a/doc/lispref/locals.texi +++ b/doc/lispref/locals.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1990, 1991, 1992, 1993, 1999, 2001, 2002, 2003, 2004, -@c 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +@c 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../../info/locals @node Standard Buffer-Local Variables, Standard Keymaps, Standard Errors, Top diff --git a/doc/lispref/macros.texi b/doc/lispref/macros.texi index a74bcb17a52..232883b2f59 100644 --- a/doc/lispref/macros.texi +++ b/doc/lispref/macros.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 2001, 2002, -@c 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +@c 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../../info/macros @node Macros, Customization, Functions, Top diff --git a/doc/lispref/makefile.w32-in b/doc/lispref/makefile.w32-in index b1419d822da..b6d3f891bee 100644 --- a/doc/lispref/makefile.w32-in +++ b/doc/lispref/makefile.w32-in @@ -1,6 +1,6 @@ # -*- Makefile -*- for the GNU Emacs Lisp Reference Manual. -# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 # Free Software Foundation, Inc. # This file is part of GNU Emacs. diff --git a/doc/lispref/maps.texi b/doc/lispref/maps.texi index bc39a3bf2a4..d1e98eee096 100644 --- a/doc/lispref/maps.texi +++ b/doc/lispref/maps.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1990, 1991, 1992, 1993, 1999, 2001, 2002, 2003, 2004, -@c 2005, 2006, 2007, 2008, 2009, 2010, 2011 +@c 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 @c Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../../info/maps diff --git a/doc/lispref/markers.texi b/doc/lispref/markers.texi index 3314ec25c84..bcccd0a90ff 100644 --- a/doc/lispref/markers.texi +++ b/doc/lispref/markers.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2001, -@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../../info/markers @node Markers, Text, Positions, Top diff --git a/doc/lispref/minibuf.texi b/doc/lispref/minibuf.texi index b2ffc5fede7..cf43881fabd 100644 --- a/doc/lispref/minibuf.texi +++ b/doc/lispref/minibuf.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2001, 2002, -@c 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +@c 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 @c Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../../info/minibuf diff --git a/doc/lispref/modes.texi b/doc/lispref/modes.texi index 3f3eb2cd1f6..f85c7bd5297 100644 --- a/doc/lispref/modes.texi +++ b/doc/lispref/modes.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2001, -@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../../info/modes @node Modes, Documentation, Keymaps, Top diff --git a/doc/lispref/nonascii.texi b/doc/lispref/nonascii.texi index b66a5446e45..7a9b2040015 100644 --- a/doc/lispref/nonascii.texi +++ b/doc/lispref/nonascii.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1998, 1999, 2001, 2002, 2003, 2004, -@c 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +@c 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../../info/characters @node Non-ASCII Characters, Searching and Matching, Text, Top diff --git a/doc/lispref/numbers.texi b/doc/lispref/numbers.texi index b27d206eb49..9335e176f9b 100644 --- a/doc/lispref/numbers.texi +++ b/doc/lispref/numbers.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2001, -@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 @c Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../../info/numbers diff --git a/doc/lispref/objects.texi b/doc/lispref/objects.texi index 7b9603c3361..cabfdbdc41b 100644 --- a/doc/lispref/objects.texi +++ b/doc/lispref/objects.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2001, -@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 @c Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../../info/objects diff --git a/doc/lispref/os.texi b/doc/lispref/os.texi index fea5e359354..85a23b273f1 100644 --- a/doc/lispref/os.texi +++ b/doc/lispref/os.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2001, -@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 @c Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../../info/os diff --git a/doc/lispref/positions.texi b/doc/lispref/positions.texi index 92846bf6d56..a1ef1560731 100644 --- a/doc/lispref/positions.texi +++ b/doc/lispref/positions.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2000, 2001, -@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../../info/positions @node Positions, Markers, Frames, Top diff --git a/doc/lispref/processes.texi b/doc/lispref/processes.texi index f3f68a79471..abf35fccd71 100644 --- a/doc/lispref/processes.texi +++ b/doc/lispref/processes.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2001, -@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 @c Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../../info/processes diff --git a/doc/lispref/searching.texi b/doc/lispref/searching.texi index 360ee1e9ae8..abab468c82d 100644 --- a/doc/lispref/searching.texi +++ b/doc/lispref/searching.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2001, -@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 @c Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../../info/searching diff --git a/doc/lispref/sequences.texi b/doc/lispref/sequences.texi index 81a0c6b952e..6575f8bb9d2 100644 --- a/doc/lispref/sequences.texi +++ b/doc/lispref/sequences.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2001, -@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 @c Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../../info/sequences diff --git a/doc/lispref/streams.texi b/doc/lispref/streams.texi index 39943372e2c..6fc2c0c773b 100644 --- a/doc/lispref/streams.texi +++ b/doc/lispref/streams.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1998, 1999, 2001, 2002, -@c 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +@c 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../../info/streams @node Read and Print, Minibuffers, Debugging, Top diff --git a/doc/lispref/strings.texi b/doc/lispref/strings.texi index 87b9f4368fb..50ca4f639b4 100644 --- a/doc/lispref/strings.texi +++ b/doc/lispref/strings.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2001, -@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 @c Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../../info/strings diff --git a/doc/lispref/symbols.texi b/doc/lispref/symbols.texi index 257a2a4c9ac..561242d58e1 100644 --- a/doc/lispref/symbols.texi +++ b/doc/lispref/symbols.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2001, -@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../../info/symbols @node Symbols, Evaluation, Hash Tables, Top diff --git a/doc/lispref/syntax.texi b/doc/lispref/syntax.texi index 0a5c9da1b7f..2ac20707444 100644 --- a/doc/lispref/syntax.texi +++ b/doc/lispref/syntax.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2001, -@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 @c Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../../info/syntax diff --git a/doc/lispref/text.texi b/doc/lispref/text.texi index f4dce6a1bc6..4f39a8f6ca2 100644 --- a/doc/lispref/text.texi +++ b/doc/lispref/text.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2000, 2001, -@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 @c Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../../info/text diff --git a/doc/lispref/tindex.pl b/doc/lispref/tindex.pl index b1c65fcf2ce..6648f5cf69c 100755 --- a/doc/lispref/tindex.pl +++ b/doc/lispref/tindex.pl @@ -1,7 +1,7 @@ #! /usr/bin/perl # Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, -# 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. # This file is part of GNU Emacs. diff --git a/doc/lispref/tips.texi b/doc/lispref/tips.texi index 9be6c061bf1..fe5e316924a 100644 --- a/doc/lispref/tips.texi +++ b/doc/lispref/tips.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1990, 1991, 1992, 1993, 1995, 1998, 1999, 2001, 2002, -@c 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +@c 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 @c Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../../info/tips diff --git a/doc/lispref/two-volume-cross-refs.txt b/doc/lispref/two-volume-cross-refs.txt index e8ec103f61c..ff5a42c2e76 100644 --- a/doc/lispref/two-volume-cross-refs.txt +++ b/doc/lispref/two-volume-cross-refs.txt @@ -1,4 +1,4 @@ -Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. See end for copying conditions. diff --git a/doc/lispref/two-volume.make b/doc/lispref/two-volume.make index edd23050287..3aa76c1c9bd 100644 --- a/doc/lispref/two-volume.make +++ b/doc/lispref/two-volume.make @@ -1,4 +1,4 @@ -# Copyright (C) 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +# Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. # See end for copying conditions. # although it would be nice to use tex rather than pdftex to avoid diff --git a/doc/lispref/two.el b/doc/lispref/two.el index 339ec299dd4..237c408c915 100644 --- a/doc/lispref/two.el +++ b/doc/lispref/two.el @@ -1,6 +1,6 @@ ;; Auxiliary functions for preparing a two volume manual. -;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 ;; Free Software Foundation, Inc. ;; --rjc 30mar92 diff --git a/doc/lispref/variables.texi b/doc/lispref/variables.texi index c4f091484e6..7e9a8187a72 100644 --- a/doc/lispref/variables.texi +++ b/doc/lispref/variables.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2000, -@c 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +@c 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 @c Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../../info/variables diff --git a/doc/lispref/vol1.texi b/doc/lispref/vol1.texi index d6bc4538adb..a62d8bd7961 100644 --- a/doc/lispref/vol1.texi +++ b/doc/lispref/vol1.texi @@ -2,7 +2,7 @@ @c This file is used for printing the GNU Emacs Lisp Reference Manual @c in two volumes. It is a modified version of elisp.texi. @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2001, -@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 @c Free Software Foundation, Inc. @c %**start of header @setfilename elisp @@ -69,7 +69,7 @@ This is edition @value{VERSION} of the GNU Emacs Lisp Reference Manual,@* corresponding to Emacs version @value{EMACSVER}. Copyright @copyright{} 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1998, -1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @quotation diff --git a/doc/lispref/vol2.texi b/doc/lispref/vol2.texi index 6f7507eb40c..788ea5a2ee4 100644 --- a/doc/lispref/vol2.texi +++ b/doc/lispref/vol2.texi @@ -2,7 +2,7 @@ @c This file is used for printing the GNU Emacs Lisp Reference Manual @c in two volumes. It is a modified version of elisp.texi. @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2001, -@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 @c Free Software Foundation, Inc. @c %**start of header @setfilename elisp @@ -69,7 +69,7 @@ This is edition @value{VERSION} of the GNU Emacs Lisp Reference Manual,@* corresponding to Emacs version @value{EMACSVER}. Copyright @copyright{} 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1998, -1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @quotation diff --git a/doc/lispref/windows.texi b/doc/lispref/windows.texi index ee9d1a8374e..51fc5063ded 100644 --- a/doc/lispref/windows.texi +++ b/doc/lispref/windows.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Emacs Lisp Reference Manual. @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2001, -@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 @c Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../../info/windows diff --git a/doc/man/ChangeLog b/doc/man/ChangeLog index 394d580c1c9..82afe511cf3 100644 --- a/doc/man/ChangeLog +++ b/doc/man/ChangeLog @@ -102,7 +102,7 @@ ;; add-log-time-zone-rule: t ;; End: - Copyright (C) 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. + Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/doc/man/b2m.1 b/doc/man/b2m.1 index e777ec43468..55567b9c104 100644 --- a/doc/man/b2m.1 +++ b/doc/man/b2m.1 @@ -45,7 +45,7 @@ according to the GNU coding standards. Copyright .if t \(co .if n (C) -2008, 2009, 2010, 2011 Free Software Foundation, Inc. +2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. .PP Permission is granted to make and distribute verbatim copies of this document provided the copyright notice and this permission notice are diff --git a/doc/man/ebrowse.1 b/doc/man/ebrowse.1 index 5481a497809..f6d90fd6ed6 100644 --- a/doc/man/ebrowse.1 +++ b/doc/man/ebrowse.1 @@ -85,7 +85,7 @@ was written by Gerd Moellmann. Copyright .if t \(co .if n (C) -2008, 2009, 2010, 2011 Free Software Foundation, Inc. +2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. .PP Permission is granted to make and distribute verbatim copies of this document provided the copyright notice and this permission notice are diff --git a/doc/man/emacs.1 b/doc/man/emacs.1 index fddef64571c..432d082b96d 100644 --- a/doc/man/emacs.1 +++ b/doc/man/emacs.1 @@ -643,7 +643,7 @@ Copyright .if t \(co .if n (C) 1995, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, -2009, 2010, 2011 +2009, 2010, 2011, 2012 Free Software Foundation, Inc. .PP Permission is granted to make and distribute verbatim copies of this diff --git a/doc/man/grep-changelog.1 b/doc/man/grep-changelog.1 index 8161b09bcba..fc699565e2a 100644 --- a/doc/man/grep-changelog.1 +++ b/doc/man/grep-changelog.1 @@ -62,7 +62,7 @@ Display basic usage information. Copyright .if t \(co .if n (C) -2008, 2009, 2010, 2011 Free Software Foundation, Inc. +2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. .PP Permission is granted to make and distribute verbatim copies of this document provided the copyright notice and this permission notice are diff --git a/doc/man/rcs-checkin.1 b/doc/man/rcs-checkin.1 index f50d74dacd5..6f944af7334 100644 --- a/doc/man/rcs-checkin.1 +++ b/doc/man/rcs-checkin.1 @@ -69,7 +69,7 @@ by Eric S. Raymond. Copyright .if t \(co .if n (C) -2008, 2009, 2010, 2011 Free Software Foundation, Inc. +2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. .PP Permission is granted to make and distribute verbatim copies of this document provided the copyright notice and this permission notice are diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index 6c9557cb0ee..90ee930650d 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -6816,7 +6816,7 @@ ;; End: Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002, - 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. + 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/doc/misc/Makefile.in b/doc/misc/Makefile.in index 9e93be4e134..201428e4f16 100644 --- a/doc/misc/Makefile.in +++ b/doc/misc/Makefile.in @@ -1,7 +1,7 @@ #### Makefile for documentation other than the Emacs manual. # Copyright (C) 1994, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, -# 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +# 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. # This file is part of GNU Emacs. diff --git a/doc/misc/ada-mode.texi b/doc/misc/ada-mode.texi index 9f4fd44f467..57182e95346 100644 --- a/doc/misc/ada-mode.texi +++ b/doc/misc/ada-mode.texi @@ -4,7 +4,7 @@ @copying Copyright @copyright{} 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, -2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/auth.texi b/doc/misc/auth.texi index 5c555e81a78..30973d35153 100644 --- a/doc/misc/auth.texi +++ b/doc/misc/auth.texi @@ -7,7 +7,7 @@ @copying This file describes the Emacs auth-source library. -Copyright @copyright{} 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +Copyright @copyright{} 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/autotype.texi b/doc/misc/autotype.texi index 7f9dd0daa02..52fb4399bfa 100644 --- a/doc/misc/autotype.texi +++ b/doc/misc/autotype.texi @@ -11,7 +11,7 @@ @copying Copyright @copyright{} 1994, 1995, 1999, 2001, 2002, 2003, 2004, 2005, -2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/calc.texi b/doc/misc/calc.texi index 0a595d90b80..e08cdfb5949 100644 --- a/doc/misc/calc.texi +++ b/doc/misc/calc.texi @@ -93,7 +93,7 @@ This file documents Calc, the GNU Emacs calculator, included with GNU Emacs 23.3 @end ifnotinfo Copyright @copyright{} 1990, 1991, 2001, 2002, 2003, 2004, -2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/cc-mode.texi b/doc/misc/cc-mode.texi index 4b56e072264..e2be356db87 100644 --- a/doc/misc/cc-mode.texi +++ b/doc/misc/cc-mode.texi @@ -160,7 +160,7 @@ CC Mode This manual is for CC Mode in Emacs. Copyright @copyright{} 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @quotation diff --git a/doc/misc/cl.texi b/doc/misc/cl.texi index 6bdc494a1a5..120aa68ddc2 100644 --- a/doc/misc/cl.texi +++ b/doc/misc/cl.texi @@ -6,7 +6,7 @@ This file documents the GNU Emacs Common Lisp emulation package. Copyright @copyright{} 1993, 2001, 2002, 2003, 2004, 2005, 2006, 2007, -2008, 2009, 2010, 2011 Free Software Foundation, Inc. +2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/dbus.texi b/doc/misc/dbus.texi index b34a25b64f8..e8d30aac479 100644 --- a/doc/misc/dbus.texi +++ b/doc/misc/dbus.texi @@ -6,7 +6,7 @@ @c %**end of header @copying -Copyright @copyright{} 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +Copyright @copyright{} 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/dired-x.texi b/doc/misc/dired-x.texi index 2a49390041a..a9a1f02d8d1 100644 --- a/doc/misc/dired-x.texi +++ b/doc/misc/dired-x.texi @@ -18,7 +18,7 @@ @copying Copyright @copyright{} 1994, 1995, 1999, 2001, 2002, 2003, 2004, -2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/ebrowse.texi b/doc/misc/ebrowse.texi index 58b04dc7b83..cd4ac7d5274 100644 --- a/doc/misc/ebrowse.texi +++ b/doc/misc/ebrowse.texi @@ -11,7 +11,7 @@ This file documents Ebrowse, a C++ class browser for GNU Emacs. Copyright @copyright{} 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, -2008, 2009, 2010, 2011 Free Software Foundation, Inc. +2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/ede.texi b/doc/misc/ede.texi index 57dc01d9fef..63b1ce4821b 100644 --- a/doc/misc/ede.texi +++ b/doc/misc/ede.texi @@ -6,7 +6,7 @@ This file describes EDE, the Emacs Development Environment. Copyright @copyright{} 1998, 1999, 2000, 2001, 2004, 2005, 2008, 2009, -2010, 2011 Free Software Foundation, Inc. +2010, 2011, 2012 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/ediff.texi b/doc/misc/ediff.texi index 8774fae5067..0c32fa59be4 100644 --- a/doc/misc/ediff.texi +++ b/doc/misc/ediff.texi @@ -26,7 +26,7 @@ This file documents Ediff, a comprehensive visual interface to Unix diff and patch utilities. Copyright @copyright{} 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/edt.texi b/doc/misc/edt.texi index 68c2db73361..361ebb7d2a3 100644 --- a/doc/misc/edt.texi +++ b/doc/misc/edt.texi @@ -6,7 +6,7 @@ This file documents the EDT emulation package for Emacs. Copyright @copyright{} 1986, 1992, 1994, 1995, 1999, 2000, 2001, 2002, -2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @quotation diff --git a/doc/misc/eieio.texi b/doc/misc/eieio.texi index f36efff3a07..b1ef64227da 100644 --- a/doc/misc/eieio.texi +++ b/doc/misc/eieio.texi @@ -11,7 +11,7 @@ @copying This manual documents EIEIO, an object framework for Emacs Lisp. -Copyright @copyright{} 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +Copyright @copyright{} 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/emacs-mime.texi b/doc/misc/emacs-mime.texi index 6121f1afd75..9479d92593b 100644 --- a/doc/misc/emacs-mime.texi +++ b/doc/misc/emacs-mime.texi @@ -10,7 +10,7 @@ This file documents the Emacs MIME interface functionality. Copyright @copyright{} 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, -2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/epa.texi b/doc/misc/epa.texi index e6402fb83f5..dcb1a70f152 100644 --- a/doc/misc/epa.texi +++ b/doc/misc/epa.texi @@ -9,7 +9,7 @@ @copying This file describes EasyPG Assistant @value{VERSION}. -Copyright @copyright{} 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +Copyright @copyright{} 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/erc.texi b/doc/misc/erc.texi index aa7cb893fd7..d3cb6b69df8 100644 --- a/doc/misc/erc.texi +++ b/doc/misc/erc.texi @@ -8,7 +8,7 @@ @copying This manual is for ERC version 5.3. -Copyright @copyright{} 2005, 2006, 2007, 2008, 2009, 2010, 2011 +Copyright @copyright{} 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @quotation diff --git a/doc/misc/eshell.texi b/doc/misc/eshell.texi index 25ba50d616e..e05048cb6b5 100644 --- a/doc/misc/eshell.texi +++ b/doc/misc/eshell.texi @@ -9,7 +9,7 @@ This manual is for Eshell, the Emacs shell. Copyright @copyright{} 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, -2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/eudc.texi b/doc/misc/eudc.texi index cf40bcce73d..56e12f4ae2d 100644 --- a/doc/misc/eudc.texi +++ b/doc/misc/eudc.texi @@ -13,7 +13,7 @@ directory servers using various protocols such as LDAP or the CCSO white pages directory system (PH/QI) Copyright @copyright{} 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2006, -2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/faq.texi b/doc/misc/faq.texi index ae2d0867fd3..55e27fa3952 100644 --- a/doc/misc/faq.texi +++ b/doc/misc/faq.texi @@ -13,7 +13,7 @@ @copying Copyright @copyright{} 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, -2009, 2010, 2011 Free Software Foundation, Inc.@* +2009, 2010, 2011, 2012 Free Software Foundation, Inc.@* Copyright @copyright{} 1994, 1995, 1996, 1997, 1998, 1999, 2000 Reuven M. Lerner@* Copyright @copyright{} 1992, 1993 Steven Byrnes@* diff --git a/doc/misc/flymake.texi b/doc/misc/flymake.texi index 75a660f040e..0effb8b7909 100644 --- a/doc/misc/flymake.texi +++ b/doc/misc/flymake.texi @@ -11,7 +11,7 @@ This manual is for GNU Flymake (version @value{VERSION}, @value{UPDATED}), which is a universal on-the-fly syntax checker for GNU Emacs. -Copyright @copyright{} 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +Copyright @copyright{} 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @quotation diff --git a/doc/misc/forms.texi b/doc/misc/forms.texi index 1ac00e6ace4..0ee861599e7 100644 --- a/doc/misc/forms.texi +++ b/doc/misc/forms.texi @@ -19,7 +19,7 @@ This file documents Forms mode, a form-editing major mode for GNU Emacs. Copyright @copyright{} 1989, 1997, 2001, 2002, 2003, 2004, -2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/gnus-coding.texi b/doc/misc/gnus-coding.texi index 666a99fc48a..a28c4cdf375 100644 --- a/doc/misc/gnus-coding.texi +++ b/doc/misc/gnus-coding.texi @@ -7,7 +7,7 @@ @syncodeindex pg cp @copying -Copyright @copyright{} 2004, 2005, 2007, 2008, 2009, 2010, 2011 Free Software +Copyright @copyright{} 2004, 2005, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @quotation diff --git a/doc/misc/gnus-faq.texi b/doc/misc/gnus-faq.texi index d224d36fcda..7eedac3c75f 100644 --- a/doc/misc/gnus-faq.texi +++ b/doc/misc/gnus-faq.texi @@ -2,7 +2,7 @@ @c Uncomment 1st line before texing this file alone. @c %**start of header @c Copyright (C) 1995, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, -@c 2009, 2010, 2011 Free Software Foundation, Inc. +@c 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @c @c Do not modify this file, it was generated from gnus-faq.xml, available from @c . diff --git a/doc/misc/gnus-news.el b/doc/misc/gnus-news.el index 5939773805a..3f48dd4a251 100644 --- a/doc/misc/gnus-news.el +++ b/doc/misc/gnus-news.el @@ -1,5 +1,5 @@ ;;; gnus-news.el --- a hack to create GNUS-NEWS from texinfo source -;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. ;; Author: Reiner Steib ;; Keywords: tools @@ -27,7 +27,7 @@ "GNUS NEWS -- history of user-visible changes. Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, - 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. + 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. See the end of the file for license conditions. Please send Gnus bug reports to bugs@gnus.org. diff --git a/doc/misc/gnus-news.texi b/doc/misc/gnus-news.texi index 4e4480689a3..6960520ed8d 100644 --- a/doc/misc/gnus-news.texi +++ b/doc/misc/gnus-news.texi @@ -1,6 +1,6 @@ @c -*-texinfo-*- -@c Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +@c Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @c Permission is granted to anyone to make or distribute verbatim copies @c of this document as received, in any medium, provided that the diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi index a3b5ddde4a1..5dc768eb411 100644 --- a/doc/misc/gnus.texi +++ b/doc/misc/gnus.texi @@ -10,7 +10,7 @@ @copying Copyright @copyright{} 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/idlwave.texi b/doc/misc/idlwave.texi index 54088cef210..c7e5683cba4 100644 --- a/doc/misc/idlwave.texi +++ b/doc/misc/idlwave.texi @@ -23,7 +23,7 @@ This is edition @value{EDITION} of the IDLWAVE User Manual for IDLWAVE @value{VERSION}. Copyright @copyright{} 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, -2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/info.texi b/doc/misc/info.texi index 03b9b64a395..a398a5c97f4 100644 --- a/doc/misc/info.texi +++ b/doc/misc/info.texi @@ -15,7 +15,7 @@ This file describes how to use Info, the on-line, menu-driven GNU documentation system. Copyright @copyright{} 1989, 1992, 1996, 1997, 1998, 1999, 2000, 2001, -2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @quotation diff --git a/doc/misc/mairix-el.texi b/doc/misc/mairix-el.texi index ff5cd922ea9..6d1760b8b5b 100644 --- a/doc/misc/mairix-el.texi +++ b/doc/misc/mairix-el.texi @@ -6,7 +6,7 @@ @documentencoding ISO-8859-1 @copying -Copyright @copyright{} 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +Copyright @copyright{} 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/makefile.w32-in b/doc/misc/makefile.w32-in index 942847976e7..e9230b58ba8 100644 --- a/doc/misc/makefile.w32-in +++ b/doc/misc/makefile.w32-in @@ -1,6 +1,6 @@ #### -*- Makefile -*- for documentation other than the Emacs manual. -# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 # Free Software Foundation, Inc. # This file is part of GNU Emacs. diff --git a/doc/misc/message.texi b/doc/misc/message.texi index cc174333261..dfa22d8908e 100644 --- a/doc/misc/message.texi +++ b/doc/misc/message.texi @@ -9,7 +9,7 @@ This file documents Message, the Emacs message composition mode. Copyright @copyright{} 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, -2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/mh-e.texi b/doc/misc/mh-e.texi index 17594701997..f5d8c700adf 100644 --- a/doc/misc/mh-e.texi +++ b/doc/misc/mh-e.texi @@ -25,7 +25,7 @@ This is version @value{VERSION}@value{EDITION} of @cite{The MH-E Manual}, last updated @value{UPDATED}. Copyright @copyright{} 1995, 2001, 2002, 2003, 2005, 2006, 2007, 2008, - 2009, 2010, 2011 Free Software Foundation, Inc. + 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @c This dual license has been agreed upon by the FSF. diff --git a/doc/misc/newsticker.texi b/doc/misc/newsticker.texi index f01fe23a6eb..b35582cdab4 100644 --- a/doc/misc/newsticker.texi +++ b/doc/misc/newsticker.texi @@ -13,7 +13,7 @@ This manual is for Newsticker (version @value{VERSION}, @value{UPDATED}). @noindent -Copyright @copyright{} 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +Copyright @copyright{} 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @quotation diff --git a/doc/misc/nxml-mode.texi b/doc/misc/nxml-mode.texi index 9ed8bcf88d0..fda1325d549 100644 --- a/doc/misc/nxml-mode.texi +++ b/doc/misc/nxml-mode.texi @@ -8,7 +8,7 @@ This manual documents nxml-mode, an Emacs major mode for editing XML with RELAX NG support. -Copyright @copyright{} 2007, 2008, 2009, 2010, 2011 +Copyright @copyright{} 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @quotation diff --git a/doc/misc/org.texi b/doc/misc/org.texi index b42de909d08..14ad5fa07f9 100644 --- a/doc/misc/org.texi +++ b/doc/misc/org.texi @@ -45,7 +45,8 @@ e.g., @copying This manual is for Org version @value{VERSION}. -Copyright @copyright{} 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation +Copyright @copyright{} 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 +Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/pcl-cvs.texi b/doc/misc/pcl-cvs.texi index e466a3bec8f..07777224746 100644 --- a/doc/misc/pcl-cvs.texi +++ b/doc/misc/pcl-cvs.texi @@ -7,7 +7,7 @@ @copying Copyright @copyright{} 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, -1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @quotation diff --git a/doc/misc/pgg.texi b/doc/misc/pgg.texi index daef19a01b5..f8db883bcdb 100644 --- a/doc/misc/pgg.texi +++ b/doc/misc/pgg.texi @@ -9,7 +9,7 @@ This file describes PGG @value{VERSION}, an Emacs interface to various PGP implementations. Copyright @copyright{} 2001, 2003, 2004, 2005, 2006, 2007, 2008, 2009, -2010, 2011 Free Software Foundation, Inc. +2010, 2011, 2012 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/rcirc.texi b/doc/misc/rcirc.texi index c8c341534fe..941aab559a8 100644 --- a/doc/misc/rcirc.texi +++ b/doc/misc/rcirc.texi @@ -5,7 +5,7 @@ @c %**end of header @copying -Copyright @copyright{} 2006, 2007, 2008, 2009, 2010, 2011 +Copyright @copyright{} 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @quotation diff --git a/doc/misc/reftex.texi b/doc/misc/reftex.texi index c5cb511c06d..0ac407fabf2 100644 --- a/doc/misc/reftex.texi +++ b/doc/misc/reftex.texi @@ -28,7 +28,7 @@ This is edition @value{EDITION} of the @b{Ref@TeX{}} User Manual for @b{Ref@TeX{}} @value{VERSION} Copyright @copyright{} 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/remember.texi b/doc/misc/remember.texi index bdaf4750d97..de27e5bfad8 100644 --- a/doc/misc/remember.texi +++ b/doc/misc/remember.texi @@ -8,7 +8,7 @@ @copying This manual is for Remember Mode, version 1.9 -Copyright @copyright{} 2001, 2004, 2005, 2007, 2008, 2009, 2010, 2011 +Copyright @copyright{} 2001, 2004, 2005, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @quotation diff --git a/doc/misc/sasl.texi b/doc/misc/sasl.texi index a75f2d80f64..7e369788390 100644 --- a/doc/misc/sasl.texi +++ b/doc/misc/sasl.texi @@ -7,7 +7,7 @@ @copying This file describes the Emacs SASL library, version @value{VERSION}. -Copyright @copyright{} 2000, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +Copyright @copyright{} 2000, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @quotation diff --git a/doc/misc/sc.texi b/doc/misc/sc.texi index d4f45fb6b93..5b20f6d241c 100644 --- a/doc/misc/sc.texi +++ b/doc/misc/sc.texi @@ -15,7 +15,7 @@ This document describes Supercite, an Emacs package for citing and attributing replies to mail and news messages. Copyright @copyright{} 1993, 2001, 2002, 2003, 2004, 2005, 2006, 2007, -2008, 2009, 2010, 2011 Free Software Foundation, Inc. +2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/sem-user.texi b/doc/misc/sem-user.texi index f986c0fd452..c325f342daf 100644 --- a/doc/misc/sem-user.texi +++ b/doc/misc/sem-user.texi @@ -1,7 +1,7 @@ @c This file is included by semantic.texi @c Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2007, 2009, -@c 2010, 2011 Free Software Foundation, Inc. +@c 2010, 2011, 2012 Free Software Foundation, Inc. @c Permission is granted to copy, distribute and/or modify this @c document under the terms of the GNU Free Documentation License, diff --git a/doc/misc/semantic.texi b/doc/misc/semantic.texi index 97f9bc21e80..3bc492cc9ba 100644 --- a/doc/misc/semantic.texi +++ b/doc/misc/semantic.texi @@ -25,7 +25,7 @@ This manual documents the Semantic library and utilities. Copyright @copyright{} 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2007, -2009, 2010, 2011 Free Software Foundation, Inc. +2009, 2010, 2011, 2012 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/ses.texi b/doc/misc/ses.texi index 6a1cbe6203c..01d11fec052 100644 --- a/doc/misc/ses.texi +++ b/doc/misc/ses.texi @@ -12,7 +12,7 @@ This file documents SES: the Simple Emacs Spreadsheet. Copyright @copyright{} 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, -2010, 2011 Free Software Foundation, Inc. +2010, 2011, 2012 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/sieve.texi b/doc/misc/sieve.texi index 139d0fa77dd..d02dfe344fb 100644 --- a/doc/misc/sieve.texi +++ b/doc/misc/sieve.texi @@ -9,7 +9,7 @@ This file documents the Emacs Sieve package, for server-side mail filtering. Copyright @copyright{} 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, -2009, 2010, 2011 Free Software Foundation, Inc. +2009, 2010, 2011, 2012 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/smtpmail.texi b/doc/misc/smtpmail.texi index 40dcf6bc926..b3cf3afda77 100644 --- a/doc/misc/smtpmail.texi +++ b/doc/misc/smtpmail.texi @@ -3,7 +3,7 @@ @settitle Emacs SMTP Library @syncodeindex vr fn @copying -Copyright @copyright{} 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +Copyright @copyright{} 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @quotation diff --git a/doc/misc/speedbar.texi b/doc/misc/speedbar.texi index 3e0373d0440..56157a8bad0 100644 --- a/doc/misc/speedbar.texi +++ b/doc/misc/speedbar.texi @@ -5,7 +5,7 @@ @copying Copyright @copyright{} 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, -2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi index 542e649aeab..00b5dd8d688 100644 --- a/doc/misc/tramp.texi +++ b/doc/misc/tramp.texi @@ -38,7 +38,7 @@ @copying Copyright @copyright{} 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, -2008, 2009, 2010, 2011 Free Software Foundation, Inc. +2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/trampver.texi b/doc/misc/trampver.texi index 6e0674c4cb3..d53e1489c97 100644 --- a/doc/misc/trampver.texi +++ b/doc/misc/trampver.texi @@ -3,7 +3,7 @@ @c This is part of the Emacs manual. @c Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, -@c 2011 Free Software Foundation, Inc. +@c 2011, 2012 Free Software Foundation, Inc. @c See file doclicense.texi for copying conditions. @c In the Tramp CVS, the version number is auto-frobbed from diff --git a/doc/misc/url.texi b/doc/misc/url.texi index 7e65e5c8675..1683bac39e2 100644 --- a/doc/misc/url.texi +++ b/doc/misc/url.texi @@ -21,7 +21,7 @@ This file documents the Emacs Lisp URL loading package. Copyright @copyright{} 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2002, -2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/vip.texi b/doc/misc/vip.texi index 539f6fe2c35..ab6f9a63869 100644 --- a/doc/misc/vip.texi +++ b/doc/misc/vip.texi @@ -4,7 +4,7 @@ @copying Copyright @copyright{} 1987, 2001, 2002, 2003, 2004, 2005, 2006, 2007, -2008, 2009, 2010, 2011 Free Software Foundation, Inc. +2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/viper.texi b/doc/misc/viper.texi index 0482f78ba15..ad9fb20dd83 100644 --- a/doc/misc/viper.texi +++ b/doc/misc/viper.texi @@ -8,7 +8,7 @@ @copying Copyright @copyright{} 1995, 1996, 1997, 2001, 2002, 2003, 2004, -2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/widget.texi b/doc/misc/widget.texi index ac111870f3e..52b9bea42cb 100644 --- a/doc/misc/widget.texi +++ b/doc/misc/widget.texi @@ -9,7 +9,7 @@ @copying Copyright @copyright{} 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, -2008, 2009, 2010, 2011 Free Software Foundation, Inc. +2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/misc/woman.texi b/doc/misc/woman.texi index 975a9c408fc..b50464a177c 100644 --- a/doc/misc/woman.texi +++ b/doc/misc/woman.texi @@ -19,7 +19,7 @@ This file documents WoMan: A program to browse Unix manual pages `W.O. (without) man'. Copyright @copyright{} 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, -2009, 2010, 2011 Free Software Foundation, Inc. +2009, 2010, 2011, 2012 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/etc/CONTRIBUTE b/etc/CONTRIBUTE index 404077258b6..dc429ecb62c 100644 --- a/etc/CONTRIBUTE +++ b/etc/CONTRIBUTE @@ -1,4 +1,4 @@ -Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 +Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. See end for license conditions. diff --git a/etc/ChangeLog b/etc/ChangeLog index 37d3ebeafff..8854fea58b8 100644 --- a/etc/ChangeLog +++ b/etc/ChangeLog @@ -5012,7 +5012,7 @@ ;; End: Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002, - 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 + 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/etc/DEBUG b/etc/DEBUG index 18a5005c5a1..0d777077f80 100644 --- a/etc/DEBUG +++ b/etc/DEBUG @@ -1,7 +1,7 @@ Debugging GNU Emacs Copyright (C) 1985, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, - 2008, 2009, 2010, 2011 Free Software Foundation, Inc. + 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. See the end of the file for license conditions. diff --git a/etc/DISTRIB b/etc/DISTRIB index 6fc09e3472d..7b96ecdd4b9 100644 --- a/etc/DISTRIB +++ b/etc/DISTRIB @@ -3,7 +3,7 @@ Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1995, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, - 2010, 2011 Free Software Foundation, Inc. + 2010, 2011, 2012 Free Software Foundation, Inc. See the end of the file for license conditions. diff --git a/etc/ERC-NEWS b/etc/ERC-NEWS index 127bb71098f..3edf79ee750 100644 --- a/etc/ERC-NEWS +++ b/etc/ERC-NEWS @@ -1,6 +1,6 @@ ERC NEWS -*- outline -*- -Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. See the end of the file for license conditions. * Changes in ERC 5.3 diff --git a/etc/ETAGS.EBNF b/etc/ETAGS.EBNF index a112a6bb1c2..667061264db 100644 --- a/etc/ETAGS.EBNF +++ b/etc/ETAGS.EBNF @@ -94,7 +94,7 @@ those. ===================== end of discussion of tag names ===================== -Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. COPYING PERMISSIONS: diff --git a/etc/ETAGS.README b/etc/ETAGS.README index ef4ef952b61..9549ed3a28f 100644 --- a/etc/ETAGS.README +++ b/etc/ETAGS.README @@ -29,7 +29,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. Copyright (C) 1984, 1987, 1988, 1989, 1993, 1994, 1995, 1998, 1999, - 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 + 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. This file is not considered part of GNU Emacs. diff --git a/etc/GNU b/etc/GNU index 08c4abc2341..8d008ecd878 100644 --- a/etc/GNU +++ b/etc/GNU @@ -1,5 +1,5 @@ Copyright (C) 1985, 1993, 2001, 2002, 2003, 2004, - 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. + 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. Permission is granted to anyone to make or distribute verbatim copies of this document, in any medium, provided that the copyright notice and diff --git a/etc/GNUS-NEWS b/etc/GNUS-NEWS index dcf378a1af1..d5e8050adfe 100644 --- a/etc/GNUS-NEWS +++ b/etc/GNUS-NEWS @@ -1,7 +1,7 @@ GNUS NEWS -- history of user-visible changes. Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, - 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. + 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. See the end of the file for license conditions. Please send Gnus bug reports to bugs@gnus.org. diff --git a/etc/HELLO b/etc/HELLO index b1bfda34336..be14c4fd139 100644 --- a/etc/HELLO +++ b/etc/HELLO @@ -72,7 +72,7 @@ Korean ($(CGQ1[(B) $(C>H3gGO<H3gGO=J4O1n(B -Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/etc/MACHINES b/etc/MACHINES index 6075e01cbc2..ed56353b288 100644 --- a/etc/MACHINES +++ b/etc/MACHINES @@ -1,7 +1,7 @@ Emacs machines list Copyright (C) 1989, 1990, 1992, 1993, 1998, 2001, 2002, 2003, 2004, - 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. + 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. See the end of the file for license conditions. This is a list of the status of GNU Emacs on various machines and systems. diff --git a/etc/MAILINGLISTS b/etc/MAILINGLISTS index da6b147e1de..ea311e6b793 100644 --- a/etc/MAILINGLISTS +++ b/etc/MAILINGLISTS @@ -318,7 +318,7 @@ mode: outline fill-column: 72 End: -Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. Permission is hereby granted, free of charge, to any person obtaining diff --git a/etc/MH-E-NEWS b/etc/MH-E-NEWS index e70f994ee62..73df347ce97 100644 --- a/etc/MH-E-NEWS +++ b/etc/MH-E-NEWS @@ -1,7 +1,7 @@ * COPYRIGHT Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, - 2010, 2011 Free Software Foundation, Inc. + 2010, 2011, 2012 Free Software Foundation, Inc. See the end of the file for license conditions. diff --git a/etc/MORE.STUFF b/etc/MORE.STUFF index 95ebedbcacd..6a7c6e67562 100644 --- a/etc/MORE.STUFF +++ b/etc/MORE.STUFF @@ -1,7 +1,7 @@ More Neat Stuff for your Emacs Copyright (C) 1993, 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, - 2009, 2010, 2011 Free Software Foundation, Inc. + 2009, 2010, 2011, 2012 Free Software Foundation, Inc. See the end of the file for license conditions. This file describes GNU Emacs programs and resources that are diff --git a/etc/NEWS b/etc/NEWS index bee994cfb0f..35a0486dfa2 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -1,6 +1,6 @@ GNU Emacs NEWS -- history of user-visible changes. -Copyright (C) 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. See the end of the file for license conditions. Please send Emacs bug reports to bug-gnu-emacs@gnu.org. diff --git a/etc/NEWS.1-17 b/etc/NEWS.1-17 index 30863639066..0a80679243f 100644 --- a/etc/NEWS.1-17 +++ b/etc/NEWS.1-17 @@ -1,6 +1,6 @@ GNU Emacs NEWS -- history of user-visible changes. 26-Mar-1986 -Copyright (C) 1985, 1986, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +Copyright (C) 1985, 1986, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. See the end of the file for license conditions. diff --git a/etc/NEWS.18 b/etc/NEWS.18 index bbee5562ac6..36501e3d62b 100644 --- a/etc/NEWS.18 +++ b/etc/NEWS.18 @@ -1,6 +1,6 @@ GNU Emacs NEWS -- history of user-visible changes. 17-Aug-1988 -Copyright (C) 1988, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +Copyright (C) 1988, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. See the end of the file for license conditions. diff --git a/etc/NEWS.19 b/etc/NEWS.19 index 347d2812600..3657f465140 100644 --- a/etc/NEWS.19 +++ b/etc/NEWS.19 @@ -1,6 +1,6 @@ GNU Emacs NEWS -- history of user-visible changes. 1992. -Copyright (C) 1993, 1994, 1995, 2001, 2006, 2007, 2008, 2009, 2010, 2011 +Copyright (C) 1993, 1994, 1995, 2001, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. See the end of the file for license conditions. diff --git a/etc/NEWS.20 b/etc/NEWS.20 index 7bbfa63337c..1b166995fb6 100644 --- a/etc/NEWS.20 +++ b/etc/NEWS.20 @@ -1,6 +1,6 @@ GNU Emacs NEWS -- history of user-visible changes. 2006-05-31 -Copyright (C) 1999, 2000, 2001, 2006, 2007, 2008, 2009, 2010, 2011 +Copyright (C) 1999, 2000, 2001, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. See the end of the file for license conditions. diff --git a/etc/NEWS.21 b/etc/NEWS.21 index 537d4211da9..dbe1bcd0728 100644 --- a/etc/NEWS.21 +++ b/etc/NEWS.21 @@ -1,6 +1,6 @@ GNU Emacs NEWS -- history of user-visible changes. 2006-05-31 -Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. See the end of the file for license conditions. diff --git a/etc/NEWS.22 b/etc/NEWS.22 index cba39763c30..01dd08d9342 100644 --- a/etc/NEWS.22 +++ b/etc/NEWS.22 @@ -1,6 +1,6 @@ GNU Emacs NEWS -- history of user-visible changes. -Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. See the end of the file for license conditions. diff --git a/etc/PROBLEMS b/etc/PROBLEMS index b419e409e2b..1cc333e7305 100644 --- a/etc/PROBLEMS +++ b/etc/PROBLEMS @@ -1,7 +1,7 @@ Known Problems with GNU Emacs Copyright (C) 1987, 1988, 1989, 1993, 1994, 1995, 1996, 1997, 1998, 1999, - 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 + 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. See the end of the file for license conditions. diff --git a/etc/README b/etc/README index 95779319ca2..cb833ec28fb 100644 --- a/etc/README +++ b/etc/README @@ -9,6 +9,6 @@ COPYRIGHT AND LICENSE INFORMATION FOR IMAGE FILES File: emacs.icon Author: Sun Microsystems, Inc - Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 + Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. License: GNU General Public License version 3 or later (see COPYING) diff --git a/etc/TERMS b/etc/TERMS index 653963b23f2..e7cdfab81f9 100644 --- a/etc/TERMS +++ b/etc/TERMS @@ -1,4 +1,4 @@ -Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. See the end of the file for copying permissions. diff --git a/etc/TODO b/etc/TODO index 4bd8cacda67..c4e07f3d062 100644 --- a/etc/TODO +++ b/etc/TODO @@ -1,6 +1,6 @@ Emacs TODO List -*-outline-*- -Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. See the end of the file for license conditions. diff --git a/etc/charsets/README b/etc/charsets/README index e9819ae2f34..3f10193e1d4 100644 --- a/etc/charsets/README +++ b/etc/charsets/README @@ -1,8 +1,8 @@ # README file for charset mapping files in this directory. -# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 # National Institute of Advanced Industrial Science and Technology (AIST) # Registration Number H13PRO009 -# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 # Free Software Foundation, Inc. # This file is part of GNU Emacs. diff --git a/etc/compilation.txt b/etc/compilation.txt index 1c5ae4f871e..92aa230997c 100644 --- a/etc/compilation.txt +++ b/etc/compilation.txt @@ -466,7 +466,7 @@ Compilation segmentation fault at Thu Jul 13 10:55:49 Compilation finished at Thu Jul 21 15:02:15 -Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. COPYING PERMISSIONS: diff --git a/etc/edt-user.el b/etc/edt-user.el index 5abf74b5808..ce617252e52 100644 --- a/etc/edt-user.el +++ b/etc/edt-user.el @@ -1,7 +1,7 @@ ;;; edt-user.el --- Sample user customizations for Emacs EDT emulation ;; Copyright (C) 1986, 1992, 1993, 2000, 2001, 2002, 2003, 2004, 2005, -;; 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +;; 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. ;; Author: Kevin Gallagher ;; Maintainer: Kevin Gallagher diff --git a/etc/emacs-buffer.gdb b/etc/emacs-buffer.gdb index ed9169a8e3c..38bffbe8ff2 100644 --- a/etc/emacs-buffer.gdb +++ b/etc/emacs-buffer.gdb @@ -1,6 +1,6 @@ # emacs-buffer.gdb --- gdb macros for recovering buffers from emacs coredumps -# Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +# Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. # Maintainer: Noah Friedman # Status: Works with Emacs 22.0.51.1 (prerelease) as of 2006-01-12. diff --git a/etc/emacs.bash b/etc/emacs.bash index cfe07c9610b..c8017f82565 100644 --- a/etc/emacs.bash +++ b/etc/emacs.bash @@ -1,6 +1,6 @@ ### emacs.bash --- contact/resume an existing Emacs, or start a new one -## Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +## Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 ## Free Software Foundation, Inc. ## Author: Noah Friedman diff --git a/etc/emacs2.py b/etc/emacs2.py index 02c12747296..388e2d3e03f 100644 --- a/etc/emacs2.py +++ b/etc/emacs2.py @@ -1,6 +1,6 @@ """Definitions used by commands sent to inferior Python in python.el.""" -# Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +# Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. # Author: Dave Love # This file is part of GNU Emacs. diff --git a/etc/emacs3.py b/etc/emacs3.py index 778be1c01f6..07b15cddbe1 100644 --- a/etc/emacs3.py +++ b/etc/emacs3.py @@ -1,4 +1,4 @@ -# Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +# Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. # Author: Dave Love # This file is part of GNU Emacs. diff --git a/etc/enriched.doc b/etc/enriched.doc index 97e90daea98..bf4e430894e 100644 --- a/etc/enriched.doc +++ b/etc/enriched.doc @@ -256,7 +256,7 @@ bug reports are welcome. -Copyright (C) 1995, 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +Copyright (C) 1995, 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. COPYING PERMISSIONS: diff --git a/etc/gnus-tut.txt b/etc/gnus-tut.txt index bb801054f44..96e04e2d172 100644 --- a/etc/gnus-tut.txt +++ b/etc/gnus-tut.txt @@ -25,7 +25,7 @@ Ingebrigtsen. If you have a WWW browser, you can investigate to your heart's delight at . ;; Copyright (C) 1995, 2001, 2002, 2003, 2004, 2005, 2006, 2007, -;; 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +;; 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Keywords: news diff --git a/etc/grammars/bovine-grammar.el b/etc/grammars/bovine-grammar.el index ee08c84eec7..e503a86f094 100644 --- a/etc/grammars/bovine-grammar.el +++ b/etc/grammars/bovine-grammar.el @@ -1,6 +1,6 @@ ;;; bovine-grammar.el --- Bovine's input grammar mode ;; -;; Copyright (C) 2002-2011 Free Software Foundation, Inc. +;; Copyright (C) 2002-2011, 2012 Free Software Foundation, Inc. ;; ;; Author: David Ponce ;; Maintainer: David Ponce diff --git a/etc/grammars/c.by b/etc/grammars/c.by index ca54159aa57..341b430fd7e 100644 --- a/etc/grammars/c.by +++ b/etc/grammars/c.by @@ -1,6 +1,6 @@ ;;; c.by -- LL grammar for C/C++ language specification -;; Copyright (C) 1999-2011 Free Software Foundation, Inc. +;; Copyright (C) 1999-2011, 2012 Free Software Foundation, Inc. ;; ;; Author: Eric M. Ludlam ;; David Ponce diff --git a/etc/grammars/grammar.wy b/etc/grammars/grammar.wy index d1a2bf15abf..a29640ebf80 100644 --- a/etc/grammars/grammar.wy +++ b/etc/grammars/grammar.wy @@ -1,6 +1,6 @@ ;;; semantic-grammar.wy -- LALR grammar of Semantic input grammars ;; -;; Copyright (C) 2002-2011 Free Software Foundation, Inc. +;; Copyright (C) 2002-2011, 2012 Free Software Foundation, Inc. ;; ;; Author: David Ponce ;; Maintainer: David Ponce diff --git a/etc/grammars/java-tags.wy b/etc/grammars/java-tags.wy index 99d2b9df81d..34469a4118b 100644 --- a/etc/grammars/java-tags.wy +++ b/etc/grammars/java-tags.wy @@ -1,6 +1,6 @@ ;;; java-tags.wy -- Semantic LALR grammar for Java -;; Copyright (C) 2002-2011 Free Software Foundation, Inc. +;; Copyright (C) 2002-2011, 2012 Free Software Foundation, Inc. ;; ;; Author: David Ponce ;; Maintainer: David Ponce diff --git a/etc/grammars/js.wy b/etc/grammars/js.wy index f67e2813daf..b0edcb50382 100644 --- a/etc/grammars/js.wy +++ b/etc/grammars/js.wy @@ -1,7 +1,7 @@ ;;; javascript-jv.wy -- LALR grammar for Javascript -;; Copyright (C) 2005-2011 Free Software Foundation, Inc. -;; Copyright (C) 1998-2011 Ecma International. +;; Copyright (C) 2005-2011, 2012 Free Software Foundation, Inc. +;; Copyright (C) 1998-2011, 2012 Ecma International. ;; Author: Joakim Verona diff --git a/etc/grammars/make.by b/etc/grammars/make.by index dab4472b737..cad97994540 100644 --- a/etc/grammars/make.by +++ b/etc/grammars/make.by @@ -1,6 +1,6 @@ ;;; make.by -- BY notation for Makefiles. -;; Copyright (C) 1999-2011 Free Software Foundation, Inc. +;; Copyright (C) 1999-2011, 2012 Free Software Foundation, Inc. ;; ;; Author: Eric M. Ludlam ;; David Ponce diff --git a/etc/grammars/python.wy b/etc/grammars/python.wy index 44d4394f369..e632cefc660 100644 --- a/etc/grammars/python.wy +++ b/etc/grammars/python.wy @@ -1,6 +1,6 @@ ;;; python.wy -- LALR grammar for Python -;; Copyright (C) 2002-2011 Free Software Foundation, Inc. +;; Copyright (C) 2002-2011, 2012 Free Software Foundation, Inc. ;; Copyright (C) 2001-2010 Python Software Foundation ;; Author: Richard Kim diff --git a/etc/grammars/scheme.by b/etc/grammars/scheme.by index bc6612d4c70..f4b131127d6 100644 --- a/etc/grammars/scheme.by +++ b/etc/grammars/scheme.by @@ -1,6 +1,6 @@ ;;; scheme.by -- Scheme BNF language specification -;; Copyright (C) 2001-2011 Free Software Foundation, Inc. +;; Copyright (C) 2001-2011, 2012 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/etc/grammars/srecode-template.wy b/etc/grammars/srecode-template.wy index 4ff2d7e4e41..9bb572e3df9 100644 --- a/etc/grammars/srecode-template.wy +++ b/etc/grammars/srecode-template.wy @@ -1,6 +1,6 @@ ;;; srecode-template.wy --- Semantic Recoder Template parser -;; Copyright (C) 2005-2011 Free Software Foundation, Inc. +;; Copyright (C) 2005-2011, 2012 Free Software Foundation, Inc. ;; Author: Eric Ludlam ;; Keywords: syntax diff --git a/etc/grammars/wisent-grammar.el b/etc/grammars/wisent-grammar.el index 67b6032ea4e..2fbf6165100 100644 --- a/etc/grammars/wisent-grammar.el +++ b/etc/grammars/wisent-grammar.el @@ -1,6 +1,6 @@ ;;; wisent-grammar.el --- Wisent's input grammar mode -;; Copyright (C) 2002-2011 Free Software Foundation, Inc. +;; Copyright (C) 2002-2011, 2012 Free Software Foundation, Inc. ;; ;; Author: David Ponce ;; Maintainer: David Ponce @@ -471,7 +471,7 @@ Menu items are appended to the common grammar menu.") "srecode/srt-wy") ("wisent-javascript-jv-wy.el" "semantic/wisent/js-wy" - "Copyright (C) 1998-2011 Ecma International" + "Copyright (C) 1998-2011, 2012 Ecma International" ,wisent-make-parsers--ecmascript-license) ("wisent-java-tags-wy.el" "semantic/wisent/javat-wy") diff --git a/etc/grep.txt b/etc/grep.txt index 704e82260e4..4b71d4e2db3 100644 --- a/etc/grep.txt +++ b/etc/grep.txt @@ -84,7 +84,7 @@ grep -nH -e "xyzxyz" ../info/* -Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011 +Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. COPYING PERMISSIONS: diff --git a/etc/images/README b/etc/images/README index 30ef4ec89e7..e340ceb7384 100644 --- a/etc/images/README +++ b/etc/images/README @@ -23,17 +23,17 @@ COPYRIGHT AND LICENSE INFORMATION FOR IMAGE FILES File: mh-logo.xpm Author: Satyaki Das - Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 + Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. Files: splash.pbm, splash.xpm, gnus.pbm Author: Luis Fernandes Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, - 2010, 2011 Free Software Foundation, Inc. + 2010, 2011, 2012 Free Software Foundation, Inc. Files: splash.png, splash.svg Author: Francesc Rocher - Copyright (C) 2008, 2009, 2010, 2011 Free Software Foundation, Inc. + Copyright (C) 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. * The following icons are from GTK+ 2.x. They are not part of Emacs, but diff --git a/etc/images/custom/README b/etc/images/custom/README index d23ad572422..3a965715012 100644 --- a/etc/images/custom/README +++ b/etc/images/custom/README @@ -6,5 +6,5 @@ COPYRIGHT AND LICENSE INFORMATION FOR IMAGE FILES Files: down.xpm down-pushed.xpm right.xpm right-pushed.xpm Author: Juri Linkov -Copyright (C) 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +Copyright (C) 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. License: GNU General Public License version 3 or later (see COPYING) diff --git a/etc/images/ezimage/README b/etc/images/ezimage/README index 1aaa4c6de4f..a491868c6f6 100644 --- a/etc/images/ezimage/README +++ b/etc/images/ezimage/README @@ -8,5 +8,5 @@ Files: bits.xpm bitsbang.xpm box-minus.xpm box-plus.xpm tag.xpm unlock.xpm Author: Eric M. Ludlam Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, - 2009, 2010, 2011 Free Software Foundation, Inc. + 2009, 2010, 2011, 2012 Free Software Foundation, Inc. License: GNU General Public License version 3 or later (see COPYING) diff --git a/etc/images/gnus/README b/etc/images/gnus/README index cf051cde2ae..017e016c1d7 100644 --- a/etc/images/gnus/README +++ b/etc/images/gnus/README @@ -8,7 +8,7 @@ COPYRIGHT AND LICENSE INFORMATION FOR IMAGE FILES Files: important.xpm, unimportant.xpm Author: Simon Josefsson Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, - 2010, 2011 Free Software Foundation, Inc. + 2010, 2011, 2012 Free Software Foundation, Inc. Files: catchup.pbm catchup.xpm cu-exit.pbm cu-exit.xpm describe-group.pbm describe-group.xpm exit-gnus.pbm exit-gnus.xpm @@ -23,11 +23,11 @@ Files: catchup.pbm catchup.xpm cu-exit.pbm cu-exit.xpm uu-post.pbm uu-post.xpm Author: Luis Fernandes Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, - 2010, 2011 Free Software Foundation, Inc. + 2010, 2011, 2012 Free Software Foundation, Inc. Files: gnus.png, gnus.svg Author: Francesc Rocher - Copyright (C) 2008, 2009, 2010, 2011 Free Software Foundation, Inc. + Copyright (C) 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. * The following icons are from GNOME 2.x. They are not part of Emacs, diff --git a/etc/images/gnus/gnus.svg b/etc/images/gnus/gnus.svg index dc29686a032..159ef3f182c 100644 --- a/etc/images/gnus/gnus.svg +++ b/etc/images/gnus/gnus.svg @@ -1,7 +1,7 @@ CFBundleShortVersionString - 23.3.50 + 23.3.90 CFBundleSignature EMAx diff --git a/nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings b/nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings index 154f7d40411..1c0e07a7380 100644 --- a/nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings +++ b/nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings @@ -1,6 +1,6 @@ /* Localized versions of Info.plist keys */ CFBundleName = "Emacs"; -CFBundleShortVersionString = "Version 23.3.50"; -CFBundleGetInfoString = "Emacs version 23.3.50, NS Windowing"; +CFBundleShortVersionString = "Version 23.3.90"; +CFBundleGetInfoString = "Emacs version 23.3.90, NS Windowing"; NSHumanReadableCopyright = "Copyright (C) 2012 Free Software Foundation, Inc."; diff --git a/nextstep/GNUstep/Emacs.base/Resources/Emacs.desktop b/nextstep/GNUstep/Emacs.base/Resources/Emacs.desktop index 32388dd01a8..5d67455578c 100644 --- a/nextstep/GNUstep/Emacs.base/Resources/Emacs.desktop +++ b/nextstep/GNUstep/Emacs.base/Resources/Emacs.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Encoding=UTF-8 Type=Application -Version=23.3.50 +Version=23.3.90 Categories=GNUstep Name=Emacs Comment=GNU Emacs for NeXT/Open/GNUstep and OS X diff --git a/nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist b/nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist index caef8666512..2f8518a1855 100644 --- a/nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist +++ b/nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist @@ -2,7 +2,7 @@ ApplicationDescription = "GNU Emacs for GNUstep / OS X"; ApplicationIcon = emacs.tiff; ApplicationName = Emacs; - ApplicationRelease = "23.3.50"; + ApplicationRelease = "23.3.90"; Authors = ( "Adrian Robert (GNUstep)", "Christophe de Dinechin (MacOS X)", @@ -13,7 +13,7 @@ ); Copyright = "Copyright (C) 2012 Free Software Foundation, Inc."; CopyrightDescription = "Released under the GNU General Public License Version 3 or later"; - FullVersionID = "Emacs 23.3.50, NS Windowing"; + FullVersionID = "Emacs 23.3.90, NS Windowing"; NSExecutable = Emacs; NSIcon = emacs.tiff; NSPrincipalClass = NSApplication; diff --git a/nt/emacs.rc b/nt/emacs.rc index 8b88d1ea4d4..5643dc88fc2 100644 --- a/nt/emacs.rc +++ b/nt/emacs.rc @@ -7,8 +7,8 @@ Emacs ICON icons\emacs.ico #endif VS_VERSION_INFO VERSIONINFO - FILEVERSION 23,3,50,0 - PRODUCTVERSION 23,3,50,0 + FILEVERSION 23,3,90,0 + PRODUCTVERSION 23,3,90,0 FILEFLAGSMASK 0x3FL #ifdef EMACSDEBUG FILEFLAGS 0x1L @@ -25,12 +25,12 @@ BEGIN BEGIN VALUE "CompanyName", "Free Software Foundation\0" VALUE "FileDescription", "GNU Emacs: The extensible self-documenting text editor\0" - VALUE "FileVersion", "23, 3, 50, 0\0" + VALUE "FileVersion", "23, 3, 90, 0\0" VALUE "InternalName", "Emacs\0" VALUE "LegalCopyright", "Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012\0" VALUE "OriginalFilename", "emacs.exe" VALUE "ProductName", "Emacs\0" - VALUE "ProductVersion", "23, 3, 50, 0\0" + VALUE "ProductVersion", "23, 3, 90, 0\0" VALUE "OLESelfRegister", "\0" END END diff --git a/nt/emacsclient.rc b/nt/emacsclient.rc index c46046fca5e..4ea2526eb94 100644 --- a/nt/emacsclient.rc +++ b/nt/emacsclient.rc @@ -5,8 +5,8 @@ Emacs ICON icons\emacs.ico #endif VS_VERSION_INFO VERSIONINFO - FILEVERSION 23,3,50,0 - PRODUCTVERSION 23,3,50,0 + FILEVERSION 23,3,90,0 + PRODUCTVERSION 23,3,90,0 FILEFLAGSMASK 0x3FL #ifdef EMACSDEBUG FILEFLAGS 0x1L @@ -23,12 +23,12 @@ BEGIN BEGIN VALUE "CompanyName", "Free Software Foundation\0" VALUE "FileDescription", "GNU EmacsClient: Client for the extensible self-documenting text editor\0" - VALUE "FileVersion", "23, 3, 50, 0\0" + VALUE "FileVersion", "23, 3, 90, 0\0" VALUE "InternalName", "EmacsClient\0" VALUE "LegalCopyright", "Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012\0" VALUE "OriginalFilename", "emacsclientw.exe" VALUE "ProductName", "EmacsClient\0" - VALUE "ProductVersion", "23, 3, 50, 0\0" + VALUE "ProductVersion", "23, 3, 90, 0\0" VALUE "OLESelfRegister", "\0" END END -- cgit v1.2.1 From 6159158006d25795b7b4f1d9f416d5f197fc701a Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Sun, 15 Jan 2012 11:23:43 +0800 Subject: * make-dist: Distribute the etc/grammars subdirectory. --- ChangeLog | 4 ++++ make-dist | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index eecf59ebd4d..29788ed8802 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2012-01-15 Chong Yidong + + * make-dist: Distribute the etc/grammars subdirectory. + 2012-01-12 Glenn Morris * configure.in: Add i386 to cpp_undefs (Bug#8497). diff --git a/make-dist b/make-dist index 3770fa1d471..dd41c094367 100755 --- a/make-dist +++ b/make-dist @@ -344,6 +344,7 @@ for subdir in lisp site-lisp \ etc/images/smilies etc/images/smilies/grayscale \ etc/images/smilies/medium etc/images/tree-widget \ etc/images/tree-widget/default etc/images/tree-widget/folder \ + etc/grammars \ etc/refcards etc/schema etc/tutorials info doc doc/emacs \ doc/misc doc/man doc/lispref doc/lispintro m4 msdos \ nextstep nextstep/Cocoa nextstep/Cocoa/Emacs.base \ @@ -583,6 +584,7 @@ echo "Making links to \`etc'" (cd etc files=`ls -d * | grep -v CVS | grep -v RCS | grep -v 'Old' | grep -v '^e$' \ | grep -v '^charsets$' | grep -v '^gnus$' | grep -v '^images$' | grep -v '^nxml$' \ + | grep -v '^grammars$' \ | grep -v '^refcards$' | grep -v '^tutorials$'| grep -v '^schema$'` ln $files ../${tempdir}/etc ## If we ended up with a symlink, or if we did not get anything @@ -606,7 +608,7 @@ echo "Making links to \`etc'" rm -f DOC* *~ \#*\# *.dvi *.log *.orig *.rej *,v =* core rm -f TAGS) -for dir in etc/charsets etc/e etc/gnus etc/nxml etc/tutorials etc/refcards etc/schema ; do +for dir in etc/charsets etc/e etc/grammars etc/gnus etc/nxml etc/tutorials etc/refcards etc/schema ; do echo "Making links to \`${dir}'" (cd ${dir} ln `ls -d * | grep -v CVS | grep -v RCS` ../../${tempdir}/${dir} -- cgit v1.2.1 From 3f0ec69d3bfc440cfeb8063e4435441cb874da72 Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Sun, 15 Jan 2012 12:11:26 +0800 Subject: Add entry for ede-project-directories to NEWS. --- etc/NEWS | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/etc/NEWS b/etc/NEWS index 35a0486dfa2..4934468d018 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -15,6 +15,18 @@ You can narrow news to a specific version by calling `view-emacs-news' with a prefix argument or by typing C-u C-h C-n. +* Changes in Specialized Modes and Packages in Emacs 23.4 + +** EDE + +*** New variable `ede-project-directories'. +EDE now refuses to automatically load a project file (Project.ede) +unless the file is in one of the directories specified by this +variable. This reduces the risk of inadvertently loading malicious +project files. The commands `M-x ede-new' and `M-x ede' now offer to +save directories to `ede-project-directories'. + + * Installation Changes in Emacs 23.4 ** The MS-Windows build prefers libpng version 1.14 or later. -- cgit v1.2.1 From 4cb0aa7579893362daebd1c203248f8bcc231f0b Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Tue, 17 Jan 2012 11:29:52 +0100 Subject: * net/tramp.el (tramp-local-end-of-line): New defcustom. (tramp-action-login, tramp-action-yesno, tramp-action-yn) (tramp-action-terminal): Use it. (Bug#10530) --- lisp/ChangeLog | 6 ++++++ lisp/net/tramp.el | 16 +++++++++++----- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 2813d80d9ff..fa51e7eb28f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2012-01-17 Michael Albinus + + * net/tramp.el (tramp-local-end-of-line): New defcustom. + (tramp-action-login, tramp-action-yesno, tramp-action-yn) + (tramp-action-terminal): Use it. (Bug#10530) + 2012-01-16 Stefan Monnier * minibuffer.el (completion--replace): Strip properties (bug#10062). diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index afb7ab4312b..98295c6617a 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -460,6 +460,12 @@ usually suffice.") "Regexp which matches `tramp-echo-mark' as it gets echoed by the remote shell.") +(defcustom tramp-local-end-of-line + (if (memq system-type '(windows-nt)) "\r\n" "\n") + "*String used for end of line in local processes." + :group 'tramp + :type 'string) + (defcustom tramp-rsh-end-of-line "\n" "*String used for end of line in rsh connections. I don't think this ever needs to be changed, so please tell me about it @@ -1902,7 +1908,7 @@ Falls back to normal file name handler if no Tramp file name handler exists." ;; operations shall return at least a default value ;; in order to give the user a chance to correct the ;; file name in the minibuffer. - ;; We cannot use 'debug as error handler. In order + ;; We cannot use `debug' as error handler. In order ;; to get a full backtrace, one could apply ;; (setq debug-on-error t debug-on-signal t) (error @@ -3116,7 +3122,7 @@ beginning of local filename are not substituted." (tramp-message vec 3 "Sending login name `%s'" tramp-current-user) (with-current-buffer (tramp-get-connection-buffer vec) (tramp-message vec 6 "\n%s" (buffer-string))) - (tramp-send-string vec tramp-current-user)) + (tramp-send-string vec (concat tramp-current-user tramp-local-end-of-line))) (defun tramp-action-password (proc vec) "Query the user for a password." @@ -3148,7 +3154,7 @@ See also `tramp-action-yn'." (throw 'tramp-action 'permission-denied)) (with-current-buffer (tramp-get-connection-buffer vec) (tramp-message vec 6 "\n%s" (buffer-string))) - (tramp-send-string vec "yes")))) + (tramp-send-string vec (concat "yes" tramp-local-end-of-line))))) (defun tramp-action-yn (proc vec) "Ask the user for confirmation using `y-or-n-p'. @@ -3162,7 +3168,7 @@ See also `tramp-action-yesno'." (throw 'tramp-action 'permission-denied)) (with-current-buffer (tramp-get-connection-buffer vec) (tramp-message vec 6 "\n%s" (buffer-string))) - (tramp-send-string vec "y")))) + (tramp-send-string vec (concat "y" tramp-local-end-of-line))))) (defun tramp-action-terminal (proc vec) "Tell the remote host which terminal type to use. @@ -3170,7 +3176,7 @@ The terminal type can be configured with `tramp-terminal-type'." (tramp-message vec 5 "Setting `%s' as terminal type." tramp-terminal-type) (with-current-buffer (tramp-get-connection-buffer vec) (tramp-message vec 6 "\n%s" (buffer-string))) - (tramp-send-string vec tramp-terminal-type)) + (tramp-send-string vec (concat tramp-terminal-type tramp-local-end-of-line))) (defun tramp-action-process-alive (proc vec) "Check, whether a process has finished." -- cgit v1.2.1 From 6d0bd9ba728ea8714baf9eef1dc9ec34000e2e96 Mon Sep 17 00:00:00 2001 From: Primoz PETERLIN Date: Tue, 17 Jan 2012 22:16:42 +0800 Subject: Update Slovenian tutorial. --- admin/FOR-RELEASE | 4 +- etc/ChangeLog | 4 + etc/tutorials/TUTORIAL.sl | 1323 ++++++++++++++++++------------------ etc/tutorials/TUTORIAL.translators | 4 +- 4 files changed, 678 insertions(+), 657 deletions(-) diff --git a/admin/FOR-RELEASE b/admin/FOR-RELEASE index daf8e33d041..6b10d51b970 100644 --- a/admin/FOR-RELEASE +++ b/admin/FOR-RELEASE @@ -117,7 +117,7 @@ TUTORIAL.pt_BR TUTORIAL.ro TUTORIAL.ru TUTORIAL.sk -TUTORIAL.sl +TUTORIAL.sl Primoz PETERLIN TUTORIAL.sv TUTORIAL.th TUTORIAL.zh @@ -203,7 +203,7 @@ help.texi hooks.texi index.texi internals.texi -intro.texi +intro.texi cyd keymaps.texi lists.texi loading.texi diff --git a/etc/ChangeLog b/etc/ChangeLog index b4e22c506a3..b13b858ca4e 100644 --- a/etc/ChangeLog +++ b/etc/ChangeLog @@ -1,3 +1,7 @@ +2012-01-17 Primoz PETERLIN + + * tutorials/TUTORIAL.sl: Update. + 2012-01-14 Eli Zaretskii * tutorials/TUTORIAL.he: Update to follow changes to TUTORIAL in diff --git a/etc/tutorials/TUTORIAL.sl b/etc/tutorials/TUTORIAL.sl index ef1fecbc86a..804fe366d50 100644 --- a/etc/tutorials/TUTORIAL.sl +++ b/etc/tutorials/TUTORIAL.sl @@ -1,41 +1,42 @@ -Prvo berilo za Emacs. Pogoji uporabe in razirjanja so navedeni na koncu. +Prvo berilo za Emacs. Pogoji uporabe in razširjanja so navedeni na koncu. -Ukazi v Emacsu v splonem vkljuujejo tipki CONTROL (vasih oznaeni -CTRL ali CTL) in META (vasih oznaena EDIT ali ALT). Namesto, da bi ju -vedno izpisali s celim imenom, bomo uporabili naslednji okrajavi: +Ukazi v Emacsu v splošnem vključujejo tipki CONTROL (včasih označeni +CTRL ali CTL) in META (včasih označena EDIT ali ALT). Namesto, da bi ju +vedno izpisali s celim imenom, bomo uporabili naslednji okrajšavi: - C- pomeni, da moramo drati pritisnjeno tipko CONTROL, ko - vtipkamo . Oznaka C-f tako pomeni: drimo pritisnjeno + C- pomeni, da moramo držati pritisnjeno tipko CONTROL, ko + vtipkamo . Oznaka C-f tako pomeni: držimo pritisnjeno tipko CONTROL in pritisnemo tipko f. - M- pomeni, da moramo drati pritisnjeno tipko META, EDIT ali - ALT, ko vtipkamo . e na tipkovnici ni tipk META, EDIT + M- pomeni, da moramo držati pritisnjeno tipko META, EDIT ali + ALT, ko vtipkamo . Če na tipkovnici ni tipk META, EDIT ali ALT, pritisnemo tipko ESC, jo spustimo in zatem - pritisnemo tipko . Tipko ESC bomo oznaevali z . + pritisnemo tipko . Tipko ESC bomo označevali z . Pomembno: Emacs zapustimo z ukazom C-x C-c (dva znaka). -V ubeniku so vaje, s katerimi preskusite nove ukaze. Oznaujeta jih -znaka ,>>` ob levem robu. Zgled: +Delno vnešen ukaz prekinete s C-g. +V učbeniku so vaje, s katerimi preskusite nove ukaze. Označujeta jih +znaka »>>« ob levem robu. Zgled: <> -[Sredina strani je iz didaktinih razlogov prazna. Besedilo se nadaljuje spodaj] ->> Vtipkajte zdaj ukaz C-v (View next screen, Prikai naslednji zaslon), +[Sredina strani je iz didaktičnih razlogov prazna. Besedilo se nadaljuje spodaj] +>> Vtipkajte zdaj ukaz C-v (View next screen, Prikaži naslednji zaslon), da se premaknete na naslednji zaslon (kar poskusite, pritisnite hkrati tipko CONTROL in V). Od zdaj naprej boste morali to - napraviti sami vsaki, ko pridete do konca zaslona. + napraviti sami vsakič, ko pridete do konca zaslona. -Ste opazili, da sta se dve vrstici s prejnjega zaslona ponovili? Ta -kontinuiteta olaja branje pri skakanju s strani na stran. +Ste opazili, da sta se dve vrstici s prejšnjega zaslona ponovili? Ta +kontinuiteta olajša branje pri skakanju s strani na stran. Prva stvar, ki si jo morate zapomniti, je, kako se premikate po -datoteki. Zdaj e veste, da se premaknete za cel zaslon naprej z +datoteki. Zdaj že veste, da se premaknete za cel zaslon naprej z ukazom C-v. Za cel zaslon nazaj pa se premaknete z ukazom M-v -(pritisnite tipko META in jo drite ter pritisnite tipko v, ali pa -pritisnite in spustite ter zatem pritisnite tipko v, e tipke -META, EDIT ali ALT na vai tipkovnici ni). +(pritisnite tipko META in jo držite ter pritisnite tipko v, ali pa +pritisnite in spustite ter zatem pritisnite tipko v, če tipke +META, EDIT ali ALT na vaši tipkovnici ni). >> Nekajkrat pritisnite M-v in C-v, da vidite, kako ukaza delujeta. -* POVZETEK +* povzetek ---------- Za pregled celega zaslona besedila so uporabni naslednji ukazi: @@ -43,110 +44,113 @@ Za pregled celega zaslona besedila so uporabni naslednji ukazi: C-v Premik se za cel zaslon naprej M-v Premik se za cel zaslon nazaj C-l Cel zaslon premaknemo tako, da je zdaj po vertikali - osredninjen okoli besedila, kjer se nahaja kazalek - (znak v C-l je rka L, ne tevka 1) + osredninjen okoli besedila, kjer se nahaja kazalček + (znak v C-l je črka L, ne števka 1) ->> Poiite kazalek na zaslonu in si zapomnite besedilo okoli njega. - Vtipkajte C-l. - Ponovno poiite kazalek. Besedilo okoli njega je ostalo isto. +>> Poiščite kazalček na zaslonu in si zapomnite besedilo okoli njega. + Zatem vtipkajte C-l. Ponovno poiščite kazalček. Opazili boste, da + je besedilo okoli njega ostalo isto, vendar se je pomaknilo na sredo + zaslona. Če še enkrat pritisnite C-l, se bo ta vrstica pomaknila na + vrh zaslona. Pritisnite C-l še enkrat, in vrstica se bo pomaknila + na dno zaslona. Za premikanje za cel zaslon naprej ali nazaj lahko tipkovnicah, ki imajo ti tipki, uporabljate tudi PageUp in PageDown. Opisan postopek s C-v in M-v pa deluje povsod. -* PREMIKANJE KAZALKA +* PREMIKANJE KAZALČKA --------------------- Premiki za celo stran naprej in nazaj so sicer uporabni, ampak kako pa pridemo do izbranega mesta na zaslonu? -Nainov je ve. Najosnovneji je uporaba ukazov C-p, C-b, C-f in -C-n. Ti po vrsti premaknejo kazalek v prejnjo vrstico, znak nazaj, -znak naprej, in v naslednjo vrstico. Ti tirje ukazi so enakovredni +Načinov je več. Najosnovnejši je uporaba ukazov C-p, C-b, C-f in +C-n. Ti po vrsti premaknejo kazalček v prejšnjo vrstico, znak nazaj, +znak naprej, in v naslednjo vrstico. Ti štirje ukazi so enakovredni kurzorskim tipkam: - prejnja vrstica, C-p + prejšnja vrstica, C-p : : - nazaj, C-b .... trenutni poloaj kazalka .... naprej, C-f + nazaj, C-b .... trenutni položaj kazalčka .... naprej, C-f : : naslednja vrstica, C-n ->> S pritiski na C-n ali C-p premaknite kazalek v sredinsko vrstico +>> S pritiski na C-n ali C-p premaknite kazalček v sredinsko vrstico na diagramu zgoraj. Zatem pritisnite C-l. S tem diagram postavite na sredino zaslona. -V angleini ima izbor tipk nazoren pomen. P kot ,previous` -(prejnji), N kot ,next` (naslednji), B kot ,backward` (nazaj) in F -kot ,forward` (naprej). Te osnovne ukaze za premikanje kazalka boste -uporabljali ves as. +V angleščini ima izbor tipk nazoren pomen. P kot »previous« +(prejšnji), N kot »next« (naslednji), B kot »backward« (nazaj) in F +kot »forward« (naprej). Te osnovne ukaze za premikanje kazalčka boste +uporabljali ves čas. ->> Nekajkrat pritisnite C-n, da pride kazalek do te vrstice. +>> Nekajkrat pritisnite C-n, da pride kazalček do te vrstice. >> Z nekaj C-f se pomaknite na desno na sredo vrstice, nato pa nekajkrat - pritisnite C-p. Opazujte, kaj se dogaja s kazalkom na sredini + pritisnite C-p. Opazujte, kaj se dogaja s kazalčkom na sredini vrstice. -Vsaka vrstice v besedilu je zakljuena z znakom za novo vrstico -(angl. Newline). Ta louje vrstico v besedilu od naslednje. Tudi -zadnja vrstica v datoteki mora biti zaljuena z znakom za novo vrstico -(eprav tega Emacs ne zahteva). +Vsaka vrstice v besedilu je zaključena z znakom za novo vrstico +(angl. Newline). Ta ločuje vrstico v besedilu od naslednje. (Tudi +zadnja vrstica v datoteki je po navadi zaključena z znakom za novo +vrstico, čeprav Emacs tega ne zahteva.) ->> Poskusite ukaz C-b, ko je kazalek na zaetku vrstice. Kazalek se - mora premakniti na konec prejnje vrstice. To je zato, ker se je +>> Poskusite ukaz C-b, ko je kazalček na začetku vrstice. Kazalček se + mora premakniti na konec prejšnje vrstice. To je zato, ker se je ravnokar premaknil prek znaka za konec vrstice. -Ukaz C-f premika kazalek prek znaka za novo vrstico enako kot C-b. +Ukaz C-f premika kazalček prek znaka za novo vrstico enako kot C-b. ->> Poskusite e nekajkrat pritisniti C-b, da dobite obutek za - premikanje kazalka. Potem nekajkrat poskusite C-f, da pridete do konca - vrstice. e enkrat pritisnite C-f, da skoite v naslednjo vrstico. +>> Poskusite še nekajkrat pritisniti C-b, da dobite občutek za + premikanje kazalčka. Potem nekajkrat poskusite C-f, da pridete do konca + vrstice. Še enkrat pritisnite C-f, da skočite v naslednjo vrstico. -Ko s kazalkom doseete zgornji ali spodnji rob zaslona, se besedilo -toliko premakne, da kazalek ostane na zaslonu. V angleini se temu -pravi ,,scrolling``. To omogoa, da lahko premaknemo kazalek na +Ko s kazalčkom dosežete zgornji ali spodnji rob zaslona, se besedilo +toliko premakne, da kazalček ostane na zaslonu. V angleščini se temu +pravi »scrolling«. To omogoča, da lahko premaknemo kazalček na katerokoli mesto v besedilu, a vseeno ostanemo na zaslonu. ->> Poskusite kazalek pripeljati s C-n isto do dna zaslona in si oglejte, +>> Poskusite kazalček pripeljati s C-n čisto do dna zaslona in si oglejte, kaj se zgodi. -e se vam zdi premikanje po en znak prepoasno, se lahko premikate za -celo besedo. M-f (META-f) premakne kazalek za eno besedo naprej, M-b +Če se vam zdi premikanje po en znak prepočasno, se lahko premikate za +celo besedo. M-f (META-f) premakne kazalček za eno besedo naprej, M-b pa za besedo nazaj. >> Poskusite nekajkrat M-f in M-b. -e je kazalek sredi besede, ga M-f prestavi na konec besede. e je v +Če je kazalček sredi besede, ga M-f prestavi na konec besede. Če je v belini med besedami, ga M-f premakne na konec naslednje besede. M-b deluje podobno, a v nasprotni smeri. ->> Nekajkrat poskusite M-f in M-b, vmes pa e nekaj C-f in - C-b. Opazujte uinke M-f in M-b, ko je kazalek sredi besede ali +>> Nekajkrat poskusite M-f in M-b, vmes pa še nekaj C-f in + C-b. Opazujte učinke M-f in M-b, ko je kazalček sredi besede ali med besedami. Ste opazili paralelo med C-f in C-b na eni strani ter M-f in M-b na -drugi? V Emacsu se dostikrat ukazi Meta nanaajo na operacije nad +drugi? V Emacsu se dostikrat ukazi Meta nanašajo na operacije nad enotami jezika (besede, stavki, odstavki), medtem ko se ukazi Control -nanaajo na operacije, neodvisne od zvrsti besedila (znaki, vrstice +nanašajo na operacije, neodvisne od zvrsti besedila (znaki, vrstice ipd.). Podobna zveza je tudi med vrsticami in stavki: ukaza C-a in C-e -premakneta kazalek na zaetek oz. konec vrstice, M-a in M-e pa na -zaetek oz. konec stavka. +premakneta kazalček na začetek oz. konec vrstice, M-a in M-e pa na +začetek oz. konec stavka. >> Poskusite nekaj ukazov C-a, potem pa nekaj ukazov C-e. Poskusite nekaj ukazov M-a, potem pa nekaj ukazov M-e. -Ste opazili, da ponovljeni C-a ne napravijo ni, ponovljeni M-a pa se -premikajo naprej? eprav se ne obnaata enako, pa je vendar obnaanje +Ste opazili, da ponovljeni C-a ne napravijo nič, ponovljeni M-a pa se +premikajo naprej? Čeprav se ne obnašata enako, pa je vendar obnašanje enega in drugega po svoje naravno. -Poloaju kazalka na zaslonu pravimo tudi ,,point``, toka. -Parafrazirano: kazalek kae na zaslonu, kje je toka v besedilu. +Položaju kazalčka na zaslonu pravimo tudi »point«, točka. +Parafrazirano: kazalček kaže na zaslonu, kje je točka v besedilu. -Povzetek preprostih ukazov za premikanje kazalka, vkljuno s premiki +Povzetek preprostih ukazov za premikanje kazalčka, vključno s premiki po besedo in stavek: C-f Premik za znak naprej @@ -156,335 +160,329 @@ po besedo in stavek: M-b Premik za besedo nazaj C-n Premik v naslednjo vrstico - C-p Premik v prejnjo vrstico + C-p Premik v prejšnjo vrstico - C-a Premik na zaetek vrstice + C-a Premik na začetek vrstice C-e Premik na konec vrstice - M-a Premik na zaetek stavka + M-a Premik na začetek stavka M-e Premik na konec stavka >> Za vajo nekajkrat poskusite vsakega od teh ukazov. To so najpogosteje uporabljani ukazi. -e dva pomembna ukaza za premikanje kazalka sta M-< (META-manji od), -ki ga premakne na zaetek datoteke, in M-> (META-veji od), ki ga +Še dva pomembna ukaza za premikanje kazalčka sta M-< (META-manjši od), +ki ga premakne na začetek datoteke, in M-> (META-večji od), ki ga premakne na konec datoteke. -Na amerikih tipkovnicah najdete znak < nad vejico in morate +Na ameriških tipkovnicah najdete znak < nad vejico in morate pritisniti tipko Shift, da pridete do njega. Z ukazom M-< je enako - prav tako morate pritisniti tipko Shift, sicer moste izvedli drug -ukaz, Meta-vejica. Na naih tipkovnicah sta oba znaka na isti tipko, -in za ukaz M-> morate pritisniti e tipko Shift. +ukaz, Meta-vejica. Na naših tipkovnicah sta oba znaka na isti tipko, +in za ukaz M-> morate pritisniti še tipko Shift. ->> Poskusite zdaj M-<, skok na zaetek tega ubenika. +>> Poskusite zdaj M-<, skok na začetek tega učbenika. Potem se vrnite nazaj z zaporednimi C-v. ->> Poskusite zdaj M->, skok na konec tega ubenika. +>> Poskusite zdaj M->, skok na konec tega učbenika. Potem se vrnite nazaj z zaporednimi M-v. -e ima vaa tipkovnica kurzorske tipke, lahko premikate kazalek po -zaslonu tudi z njimi. Vseeno priporoamo, da se privadite ukazov C-b, -C-f, C-n in C-p, in to iz treh razlogov. Prvi, delujejo na isto vseh -terminalih. Drugi, z nekaj prakse v Emacsu boste opazili, da je -tipkanje ukazov s CONTROL hitreje od tipkanja s kurzorskimi tipkami, ker -ni treba ves as premikati desnice s tipkovnice na kurzorske tipke in -nazaj. In tretji, ko se enkrat navadite teh ukazov s CONTROL, se boste -enostavneje nauili tudi bolj zapletenih ukazov za premikanje kazalka. - -Veini ukazov v Emacsu lahko podamo tevilni argument; najvekrat ta -pove, kolikokrat zapovrstjo naj se ukaz izvede. Vekratno ponovitev -ukaza izvedemo tako, da najprej vtipkamo C-u, zatem tevilo, -kolikokrat naj se ukaz ponovi, in nazadnje eljeni ukaz. e ima vaa +Če ima vaša tipkovnica kurzorske tipke, lahko premikate kazalček po +zaslonu tudi z njimi. Vseeno priporočamo, da se privadite ukazov C-b, +C-f, C-n in C-p, in to iz treh razlogov. Prvič, delujejo na čisto vseh +terminalih. Drugič, z nekaj prakse v Emacsu boste opazili, da je +tipkanje ukazov s CONTROL hitrejše od tipkanja s kurzorskimi tipkami, ker +ni treba ves čas premikati desnice s tipkovnice na kurzorske tipke in +nazaj. In tretjič, ko se enkrat navadite teh ukazov s CONTROL, se boste +enostavneje naučili tudi bolj zapletenih ukazov za premikanje kazalčka. + +Večini ukazov v Emacsu lahko podamo številčni argument; največkrat ta +pove, kolikokrat zapovrstjo naj se ukaz izvede. Večkratno ponovitev +ukaza izvedemo tako, da najprej vtipkamo C-u, zatem število, +kolikokrat naj se ukaz ponovi, in nazadnje željeni ukaz. Če ima vaša tipkovnica tipko META (ali EDIT ali ALT), lahko izpustite ukaz C-u in -namesto tega vtipkate tevilo ponovitev, medtem ko drite pritisnjeno -tipko META. Druga metoda je sicer kraja, priporoamo pa prvo, ker -deluje na vseh terminalih. Taken tevilni argument je ,,prefiksni`` -argument, ker vnesemo argument pred ukazom, na katerega se nanaa. +namesto tega vtipkate število ponovitev, medtem ko držite pritisnjeno +tipko META. Druga metoda je sicer krajša, priporočamo pa prvo, ker +deluje na vseh terminalih. Takšen številčni argument je »prefiksni« +argument, ker vnesemo argument pred ukazom, na katerega se nanaša. -Zgled: C-u 8 C-f premakne kazalek za osem znakov naprej. +Zgled: C-u 8 C-f premakne kazalček za osem znakov naprej. ->> Poskusite s primernim argumentom za tevilo ponovitev ukaza - C-n ali C-p priti im blie tej vrstici v enem samem skoku. +>> Poskusite s primernim argumentom za število ponovitev ukaza + C-n ali C-p priti čim bliže tej vrstici v enem samem skoku. -Veina ukazov, ne pa vsi, uporablja tevilni argument kot tevilo +Večina ukazov, ne pa vsi, uporablja številčni argument kot število ponovitev ukaza. Nekateri ukazi - nobeden od tistih, ki smo si jih ogledali do zdaj - ga uporabljajo kot stikalo: s podanim prefiksnim -argumentom napravi ukaz nekaj drugega kot obiajno. +argumentom napravi ukaz nekaj drugega kot običajno. -Ukaza C-v in M-v sta tudi izjemi, a drugani. e jima podamo argument, -premakneta zaslon za navedeno tevilo vrstic, ne pa zaslonov. Ukaz C-u +Ukaza C-v in M-v sta tudi izjemi, a drugačni. Če jima podamo argument, +premakneta zaslon za navedeno število vrstic, ne pa zaslonov. Ukaz C-u 8 C-v, na primer, premakne zaslon navzgor za 8 vrstic. >> Poskusite zdaj C-u 8 C-v -To bi moralo zaslon premakniti navzgor za osem vrstic. e bi ga radi +To bi moralo zaslon premakniti navzgor za osem vrstic. Če bi ga radi premaknili nazaj, poskusite M-v z istim argumentom. -e uporabljate grafini vmesnik, denimo X11 ali MS Windows, imate -verjetno ob robu Emacsovega okna navpino pravokotno ploskev, +Če uporabljate grafični vmesnik, denimo X ali MS Windows, imate +verjetno ob robu Emacsovega okna pokončno pravokotno ploskev, imenovano drsnik. Pogled na besedilo lahko premikate tudi tako, da z -miko kliknete na drsnik. +miško kliknete na drsnik. ->> Postavite kazalec na vrh oznaenega obmoja na drsniku in pritisnite - srednji gumb na miki. To bi moralo premakniti besedilo na mesto, - doloeno s tem, kako visoko ali nizko na drsnik ste kliknili. ->> Medtem ko drite srednji gumb pritisnjen, premikajte miko gor in - dol. Vidite, kako se premika besedilo v Emacsovem oknu, ko - premikate miko? - - -* E SE EMACS OBESI -------------------- +* ČE SE EMACS PRENEHA ODZIVATI +------------------------------ -e se Emacs preneha odzivati na vae ukaze, ga lahko varno prekinete z +Če se Emacs preneha odzivati na vaše ukaze, ga lahko varno prekinete z ukazom C-g. Z njim lahko prekinete ukaze, za katere bi trajalo predolgo, da bi se izvedli. -Isti ukaz, C-g, lahko uporabite tudi, da prekliete tevilni -argument, ali pa zaetek ukaza, ki ga ne elite izvesti. +Isti ukaz, C-g, lahko uporabite tudi, da prekličete številčni +argument, ali pa začetek ukaza, ki ga ne želite izvesti. ->> Vtipkajte C-u 100, s imer ste izbrali tevilni argument 100, - zatem pa vtipkajte C-g. Vtipkajte zdaj C-f. Kazalek se je - premaknil le za en znak, ker ste tevilni argument vmes preklicali +>> Vtipkajte C-u 100, s čimer ste izbrali številčni argument 100, + zatem pa vtipkajte C-g. Vtipkajte zdaj C-f. Kazalček se je + premaknil le za en znak, ker ste številčni argument vmes preklicali s C-g. -Tudi e ste po nesrei vtipkali , se ga lahko znebite s C-g. +Tudi če ste po nesreči vtipkali , se ga lahko znebite s C-g. -* ONEMOGOENI UKAZI +* ONEMOGOČENI UKAZI ------------------- -Nekaj ukazov v Emacsu je namenoma ,,onemogoenih``, da bi jih -zaetniki ne izvedli po nesrei. +Nekaj ukazov v Emacsu je namenoma »onemogočenih«, da bi jih +začetniki ne izvedli po nesreči. -e vtipkate tak onemogoen ukaz, se bo na zaslonu pojavilo novo okno z -obvestilom, kateri ukaz ste skuali izvesti, in vas vpraalo, e ga -res elite izvesti. +Če vtipkate tak onemogočen ukaz, se bo na zaslonu pojavilo novo okno z +obvestilom, kateri ukaz ste skušali izvesti, in vas vprašalo, če ga +res želite izvesti. -e v resnici elite poskusiti ukaz, pritisnite preslednico kot odgovor -na vpraanje. Normalno verjetno ukaza ne elite izvesti, zato na -vpraanje odgovorite z ,n`. +Če v resnici želite poskusiti ukaz, pritisnite preslednico kot odgovor +na vprašanje. Normalno verjetno ukaza ne želite izvesti, zato na +vprašanje odgovorite z »n«. ->> Vtipkajte C-x C-l (ki je onemogoen ukaz), - zatem na vpraanje odgovorite n. +>> Vtipkajte C-x C-l (ki je onemogočen ukaz), + zatem na vprašanje odgovorite n. * OKNA ------ -Emacs lahko prikae ve oken in v vsakem svoje besedilo. Kasneje bomo -razloili, kako uporabljamo ve oken hkrati. Zaenkrat bomo povedali -le, kako se znebite dodatnih oken, ki jih lahko odpre vgrajena pomo ali -pa izpis kaknega drugega programa. Preprosto je: +Emacs lahko prikaže več »oken« in v vsakem svoje besedilo. Kasneje +bomo razložili, kako uporabljamo več oken hkrati. Zaenkrat bomo +povedali le, kako se znebite dodatnih oken, ki jih lahko odpre +vgrajena pomoč ali pa izpis kakšnega drugega programa. Preprosto je: C-x 1 Eno okno (torej, zaprimo vsa ostala). -To je CONTROL-x, ki mu sledi tevka 1. Ukaz C-x 1 raztegne ez cel -zaslon okno, v katerem se nahaja kazalek, ostala pa zapre. +To je CONTROL-x, ki mu sledi števka 1. Ukaz C-x 1 raztegne čez cel +zaslon okno, v katerem se nahaja kazalček, ostala pa zapre. ->> Premaknite kazalek do te vrstice in vtipkajte C-u 0 C-l ->> Vtipkajte CONTROL-h k CONTROL-f. - Vidite, kako se je to okno skrilo in odstopilo prostor oknu, - ki pojasnjuje ukaz CONTROL-f? +>> Premaknite kazalček do te vrstice in vtipkajte C-u 0 C-l +>> Vtipkajte C-h k C-f. + Vidite, kako se je to okno skrčilo in odstopilo prostor oknu, + ki pojasnjuje ukaz C-f? >> Vtipkajte C-x 1 in spodnje okno se bo zaprlo. -Za razliko od ukazov, ki smo se jih nauili do zdaj, je ta ukaz -sestavljen iz dveh znakov. Zane se z znakom CONTROL-x. Cela vrsta -ukazov se zane enako, in mnogi od njih zadevajo delo z datotekami, -delovnimi podroji in podobnim. Vsem tem ukazom je skupno, da se -zanejo s CONTROL-x, ki mu sledi e en, dva ali trije znaki. +Za razliko od ukazov, ki smo se jih naučili do zdaj, je ta ukaz +sestavljen iz dveh znakov. Začne se z znakom CONTROL-x. Cela vrsta +ukazov se začne enako, in mnogi od njih zadevajo delo z datotekami, +delovnimi področji in podobnim. Vsem tem ukazom je skupno, da se +začnejo s CONTROL-x, ki mu sledi še en, dva ali trije znaki. * VRIVANJE IN BRISANJE ---------------------- -e elite v obstojee besedilo vriniti novo, preprosto premaknite -kazalek na eljeno mesto in zanite tipkati. Znake, ki jih lahko -vidite, na primer A, 7, * in podobno, razume Emacs kot del besedila in -jih takoj vrine. S pritiskom na Return (ali Enter) vrinete znak za -skok v novo vrstico. - -Zadnji vtipkani znak lahko izbriete s pritiskom na tipko -. To je tista tipka na tipkovnici, ki jo navadno uporabljate -za brisanje nazadnje natipkanega znaka. Navadno je to velika tipka -vrstico ali dve nad tipko , ki je oznaena z "Backspace", -"Delete" ali "Del". +Če želite v obstoječe besedilo vriniti novo, preprosto premaknite +kazalček na želeno mesto in začnite tipkati. Vidne znake, na primer A, +7, * in podobno, Emacs vrine takoj, ko jih vtipkate. S pritiskom na +tipko (ali ) vrinete znak za skok v novo vrstico. -e imate na tipkovnici tipko "Backspace", je to tipka . Naj -vas ne zmede, e imate poleg tega e tipko "Delete" - je -"Backspace". +Zadnji vtipkani znak lahko izbrišete s pritiskom na tipko . Ta +tipka je na tipkovnici običajno označena z »Backspace« - skratka, to +je ista tipka, ki jo tudi v drugih programih uporabljate za brisanje +nazadnje natipkanega znaka. -Splono pobrie znak neposredno pred trenutnim poloajem -kazalka. +Najverjetneje imate na tipkovnici še tipko »Delete«. Naj vas to ne +zmede - z mislimo tipko »Backspace«. ->> Vtipkajte zdaj nekaj znakov in jih zatem s tipko pobriite. - Ni naj vas ne skrbi, e se je ta vrstica spremenila. Izvirnika - tega ubenika ne boste pokvarili -- tole je samo vaa osebna kopija. +>> Poskusite zdaj! Vtipkajte zdaj nekaj znakov in jih zatem s tipko + pobrišite. Nič naj vas ne skrbi, če se je ta vrstica + spremenila. Izvirnika tega učbenika ne boste pokvarili -- tole je + samo vaša osebna delovna kopija. -Ko vrstica postane predolga za zaslon, se ,,nadaljuje`` v naslednji -vrstici na zaslonu. Obrnjena poevnica (znak ,\`) ali v grafinih -okoljih zavita puica ob desnem robu oznauje vrstico, ki se -nadaljuje v naslednji zaslonski vrstici. +Ko vrstica postane predolga za zaslon, se »nadaljuje« v naslednji +vrstici na zaslonu. Če uporabljate grafično okolje, boste opazili +zaviti puščici ob levem in desnem robu, ki označujeta vrstico, ki se +nadaljuje v naslednji zaslonski vrstici. Če uporabljate terminalski +vmesnik, je vrstica, ki se nadaljuje v naslednji zaslonski vrstici, +označena z obrnjeno poševnico (znak »\«) v skrajnem desnem stolpcu. ->> Zdaj zanite tipkati besedilo, dokler ne doseete desnega roba, in - e naprej. Opazili boste, da se pojavi znak za nadaljevanje. +>> Zdaj začnite tipkati besedilo, dokler ne dosežete desnega roba, in + še naprej. Opazili boste, da se pojavi znak za nadaljevanje. ->> S tipko pobriite toliko znakov, da vrstica ne sega - ve ez irino zaslona. Znak za nadaljevanje v naslednji +>> S tipko pobrišite toliko znakov, da vrstica ne sega + več čez širino zaslona. Znak za nadaljevanje v naslednji vrstici je izginil. -Znak za novo vrstico lahko pobriemo enako kot vsak drug znak. S tem, -ko pobriemo znak za novo vrstico, zdruimo vrstici v eno samo. e bo -nova vrstica predolga, da bi cela prila na zaslon, bo razdeljena v -ve zaslonskih vrstic. +Znak za novo vrstico lahko pobrišemo enako kot vsak drug znak. S tem, +ko pobrišemo znak za novo vrstico, združimo vrstici v eno samo. Če bo +nova vrstica predolga, da bi cela prišla na zaslon, bo razdeljena v +več zaslonskih vrstic. ->> Premaknite kazalek na zaetek vrstice in pritisnite . To - zdrui vrstico s prejnjo. +>> Premaknite kazalček na začetek vrstice in pritisnite . To + združi vrstico s prejšnjo. >> Pritisnite . S tem ste ponovno vrinili znak za skok v novo vrstico, ki ste ga malo prej zbrisali. -Spomnimo se, da lahko za veino ukazov v Emacsu doloimo, naj se -izvedejo vekrat zaporedoma; to vkljuuje tudi vnos teksta. Ponovitev -obiajnega znaka ga vekrat vrine v besedilo. +Spomnimo se, da lahko za večino ukazov v Emacsu določimo, naj se +izvedejo večkrat zaporedoma; to vključuje tudi vnos teksta. Ponovitev +običajnega znaka ga večkrat vrine v besedilo. >> Poskusite zdaj tole: da vnesete osem zvezdic, vtipkajte C-u 8 * -Zdaj ste se nauili najpreprosteji nain, da v Emacsu nekaj natipkate -in popravite. Briete lahko tudi besede ali vrstice. Tu je povzetek +Zdaj ste se naučili najpreprostejši način, da v Emacsu nekaj natipkate +in popravite. Brišete lahko tudi besede ali vrstice. Tu je povzetek ukazov za brisanje: - pobrie znak tik pred kazalkom (levo od - oznake za kazalek) - C-d pobrie znak tik za kazalkom (,pod` oznako - za kazalek) + pobriše znak tik pred kazalčkom (levo od + oznake za kazalček) + C-d pobriše znak tik za kazalčkom (»pod« oznako + za kazalček) - M- pobrie besedo tik pred kazalkom - M-d pobrie besedo tik za kazalkom + M- pobriše besedo tik pred kazalčkom + M-d pobriše besedo tik za kazalčkom - C-k zavre besedilo desno od kazalka do konca vrstice - M-k zavre besedilo od poloaja kazalka do konca stavka + C-k zavrže besedilo desno od kazalčka do konca vrstice + M-k zavrže besedilo od položaja kazalčka do konca stavka -rka ,d` je iz angleke besede ,delete` (pobrisati), rka ,k` pa iz -besede ,kill` (pobiti). Ste opazili, da in C-d na eni, ter -M- in M-d na drugi strani nadaljujeta paralelo, ki sta jo zaela -C-f in M-f ( pravzaprav ni kontrolni znak, kar pa naj nas ne +Črka »d« je iz angleške besede »delete« (pobrisati), črka »k« pa iz +besede »kill« (pobiti). Ste opazili, da in C-d na eni, ter +M- in M-d na drugi strani nadaljujeta paralelo, ki sta jo začela +C-f in M-f ( pravzaprav ni kontrolni znak, kar pa naj nas ne moti). C-k in M-k sta v enakem sorodu s C-e in M-e: prvi deluje na vrstice, drugi na stavke. -Obstaja tudi sploen postopek za brisanje kateregakoli dela delovnega -podroja. Kazalek postavimo na en konec podroja, ki ga elimo -izbrisati, in pritisnemo C-@ ali C-SPC (SPC je -preslednica). Katerikoli od obeh ukazov deluje. Premaknite kazalek na -drug konec podroja, ki ga elite izbrisati, in pritisnite C-w. S tem -ste zavrgli vse besedilo med obema mejama. +Obstaja tudi splošen postopek za brisanje kateregakoli dela delovnega +področja. Kazalček postavimo na en konec področja, ki ga želimo +izbrisati, in pritisnemo C-@ ali C- ( je preslednica). +Katerikoli od obeh ukazov deluje. Premaknite kazalček na drug konec +področja, ki ga želite izbrisati. Med premikanjem Emacs z barvo +označuje področje med kazalčkom in mestom, kjer ste pritisnili +C-. Končno pritisnite C-w. S tem ste zavrgli vse besedilo med +obema mejama. ->> Premaknite kazalek na rko O, s katero se zaenja prejnji +>> Premaknite kazalček na črko O, s katero se začenja prejšnji odstavek. ->> Vtipkajte C-SPC. Emacs prikae sporoilo "Mark set" (slov. Oznaka - postavljena) na dnu ekrana. ->> Premaknite kazalek na rko V v "postavimo" v drugi vrstici istega +>> Vtipkajte C-SPC. Emacs prikaže sporočilo »Mark set« (slov. »oznaka + postavljena«) na dnu ekrana. +>> Premaknite kazalček na črko V v »postavimo« v drugi vrstici istega odstavka. ->> Vtipkajte C-w. S tem zavremo vse besedilo zaeni z O in vse do - rke V. - -Razlika med tem, e zavrete cel odstavek besedila (angl. ,,kill``, -pobiti) ali pa e pobriete znak (angl. ,,delete``), je ta, da lahko -prvega vrnete nazaj z ukazom C-y, drugega pa ne. Na splono ukazi, ki -lahko povzroijo veliko kode (pobriejo veliko besedila), shranijo -pobrisano besedilo; tisti, ki pobriejo samo posamezni znak, ali samo -prazne vrstice in presledke, pa ne. - ->> Postavite kazalek na zaetek neprazne vrstice. Pritisnite C-k, da - pobriete vsebino vrstice. ->> e enkrat pritisnite C-k. To pobrie e znak za novo vrstico. - -Ste opazili, da prvi C-k pobrie vsebino vrstice, naslednji C-k pa e -vrstici samo, s imer se vse besedilo pod bivo vrstico premakne za -eno vrstico navzgor? Ukaz C-k obravnava tevilni argument malo -drugae: pobrie toliko in toliko vrstic z vsebinami vred. To ni zgolj -ponovitev. C-u 2 C-k pobrie dve polni vrstici besedila, kar je nekaj -drugega, kot e dvakrat vtipkate C-k. - -Besedilo, ki ste ga prej pobili, lahko povrnete (angl. ,,yank`` -- +>> Vtipkajte C-w. S tem zavržemo vse besedilo začenši z O in vse do + črke V. + +Razlika med tem, če zavržete cel odstavek besedila (angl. »kill«, +pobiti) ali pa če pobrišete znak (angl. »delete«), je ta, da lahko +prvega povrnete - na katerokoli mesto v besedilu - z ukazom C-y, +drugega pa ne (seveda pa lahko prekličete brisanje - glejte nižje). Na +splošno ukazi, ki lahko povzročijo veliko škode (pobrišejo veliko +besedila), shranijo pobrisano besedilo; tisti, ki pobrišejo samo +posamezni znak, ali samo prazne vrstice in presledke, pa ne. + +>> Postavite kazalček na začetek neprazne vrstice. Pritisnite C-k, da + pobrišete vsebino vrstice. +>> Še enkrat pritisnite C-k. To pobriše še znak za novo vrstico. + +Ste opazili, da prvi C-k pobriše vsebino vrstice, naslednji C-k pa še +vrstici samo, s čimer se vse besedilo pod bivšo vrstico premakne za +eno vrstico navzgor? Ukaz C-k obravnava številčni argument malo +drugače: pobriše toliko in toliko vrstic z vsebinami vred. To ni zgolj +ponovitev. C-u 2 C-k pobriše dve polni vrstici besedila, kar je nekaj +drugega, kot če dvakrat vtipkate C-k. + +Besedilo, ki ste ga prej pobili, lahko povrnete (angl. »yank« - potegniti). Predstavljajte si, kot da potegnete nazaj nekaj, kar vam je nekdo odnesel. Pobito besedilo lahko potegnete nazaj na isti ali pa -na kaken drug kraj v besedilu, ali pa celo v kaki drugi -datoteki. Isto besedilo lahko vekrat potegnete nazaj, tako da je v -delovnem podroju poveterjeno. +na kakšen drug kraj v besedilu, ali pa celo v kaki drugi datoteki. +Isto besedilo lahko večkrat potegnete nazaj, tako da je v delovnem +področju povečterjeno. Nekateri drugi urejevalniki uporabljajo namesto +»kill« in »yank« izraza »cut« in »paste« (glejte glosar v priročniku +za Emacs). -Ukaz za vraanje pobitega besedila je C-y. +Ukaz za vračanje pobitega besedila je C-y. >> Poskusite z ukazom C-y povrniti pobrisano besedilo. -e ste uporabili ve zaporednih ukazov C-k, je vse pobrisano besedilo +Če ste uporabili več zaporednih ukazov C-k, je vse pobrisano besedilo shranjeno skupaj, in en sam C-y bo vrnil vse tako pobrisane vrstice. >> Poskusite, nekajkrat vtipkajte C-k. Zdaj pa vrnimo pobrisano besedilo: ->> Vtipkajte C-y. Zdaj pa premaknite kazalek za nekaj vrstic navzdol - in e enkrat vtipkajte C-y. Vidite zdaj, kako se kopira dele +>> Vtipkajte C-y. Zdaj pa premaknite kazalček za nekaj vrstic navzdol + in še enkrat vtipkajte C-y. Vidite zdaj, kako se kopira dele besedila? -Kaj pa, e ste pobrisali nekaj besedila, ki bi ga radi vrnili, vendar -ste za iskanim odlomkom pobrisali e nekaj? C-y vrne samo nazadnje -pobrisan odlomek. Vendar tudi prejnje besedilo ni izgubljeno. Do +Kaj pa, če ste pobrisali nekaj besedila, ki bi ga radi vrnili, vendar +ste za iskanim odlomkom pobrisali še nekaj? C-y vrne samo nazadnje +pobrisan odlomek. Vendar tudi prejšnje besedilo ni izgubljeno. Do njega lahko pridete z ukazom M-y. Ko ste vrnili nazadnje zbrisano besedilo s C-y, pritisnite M-y, ki ga zamenja s predzanje pobrisanim -besedilom. Vsak naslednji M-y prikae e eno prej. Ko ste konno -prili do iskanega besedila, ni treba napraviti ni posebnega, da bi -ga obdrali. Preprosto nadaljujte z urejanjem, in vrnjeno besedilo bo -ostalo, kamor ste ga odloili. +besedilom. Vsak naslednji M-y prikaže še eno prej. Ko ste končno +prišli do iskanega besedila, ni treba napraviti nič posebnega, da bi +ga obdržali. Preprosto nadaljujte z urejanjem, in vrnjeno besedilo bo +ostalo, kamor ste ga odložili. -e pritisnete M-y dovolj velikokrat, se boste vrnili na zaete, torej +Če pritisnete M-y dovolj velikokrat, se boste vrnili na začete, torej spet na zadnje pobrisano besedilo. ->> Pobriite vrstico, premaknite se nekam drugam, in pobriite e +>> Pobrišite vrstico, premaknite se nekam drugam, in pobrišite še eno vrstico. Z ukazom C-y dobite nazaj to drugo vrstico. Z ukazom M-y pa jo zamenjate s prvo vrstico. - Ponovite ukaz M-y e nekajkrat in si oglejte, kaj dobite na - zaslon. Ponavljajte ga, dokler se ne prikae ponovno nazadnje - pobrisana vrstica, in e naprej. e elite, lahko tudi ukazu - M-y podate pozitivno ali negativno tevilo ponovitev. + Ponovite ukaz M-y še nekajkrat in si oglejte, kaj dobite na + zaslon. Ponavljajte ga, dokler se ne prikaže ponovno nazadnje + pobrisana vrstica, in še naprej. Če želite, lahko tudi ukazu + M-y podate pozitivno ali negativno število ponovitev. * PREKLIC UKAZA (UNDO) ---------------------- -e ste besedilo spremenili, a ste se kasneje premislili, lahko -besedilo vrnete v prvotno stanje z ukazom Undo, C-x u. Normalno vrne -C-x u zadnjo spremembo besedila; e ukaz ponovimo, prekliemo e -predzadnjo spremembo, in vsaka nadaljnja ponovitev see e eno +Če ste besedilo spremenili, a ste se kasneje premislili, lahko +besedilo vrnete v prvotno stanje z ukazom Undo, C-/. + +Običajno C-/ prekliče spremembo besedila, ki jo izvede en ukaz; če +ukaz C-/ ponovimo, prekličemo še spremembo, ki jo je izvedel +predzadnji ukaz, in vsaka nadaljnja ponovitev C-/ seže še eno spremembo globlje v zgodovino. -Emacs hrani bolj ali manj celotno zgodovino naih ukazov, z dvema -izjemama: ukazov, ki niso napravili nobene spremembe v besedilu -(npr. premik kazalka), ne shranjuje, in zaporedje do 20 vrinjenih -znakov shrani kot en sam ukaz. Slednje prihrani nekaj ukazov C-x u, ki -bi jih morali vtipkati. +Emacs hrani bolj ali manj celotno zgodovino naših ukazov, z dvema +izjemama: ukazov, ki niso napravili nobene spremembe v besedilu (npr. +premik kazalčka), ne shranjuje, in zaporedje do 20 vrinjenih znakov +shrani kot en sam ukaz. Slednje prihrani nekaj ukazov C-/, ki bi jih +morali vtipkati. ->> Pobriite to vrstico z ukazom C-k, potem jo prikliite nazaj s C-x u. +>> Pobrišite to vrstico z ukazom C-k, potem jo prikličite nazaj s C-/. -C-_ je alternativni ukaz za preklic zadnjega ukaza. Deluje enako kot -s C-x u, ga je pa laje odtipkati, e morate ukaz ponoviti vekrat -zaporedoma. Teava z ukazom C-_ je, da na nekaterih tipkovnicah ni -povsem oitno, kako ga vtipkati, zato je podvojen e kot C-x u. Na -nekaterih terminalih moramo na primer vtipkati /, medtem ko drimo -pritisnjeno tipko CONTROL. +C-_ je alternativni ukaz za preklic zadnjega ukaza. Deluje povsem +enako kot C-/. Na nekaterih besedilnih terminalih v resnici pritisk +C-/ pošlje Emacsu ukaz C-_. Še tretja možnost je C-x u, ki tudi deluje +povsem enako kot C-/, le z nekaj več tipkanja. -e podamo ukazu C-_ ali C-x u numerini argument, je to enako, kot e -bi ukaz rono ponovili tolikokrat, kot pravi argument. +Če podamo ukazu C-/, C-_ ali C-x u numerični argument, je to enako, +kot če bi ukaz ročno ponovili tolikokrat, kot pravi argument. -Ukaz za brisanje besedila lahko prekliete in besedilo povrnete, -enako, kot e bi besedilo pobili. Razlika med brisanjem in pobijanjem -besedila je le ta, da le slednje lahko potegnete nazaj z ukazom -C-y. Preklic ukaza pa velja za eno in drugo. +Ukaz za brisanje besedila lahko prekličete in besedilo povrnete, +enako, kot če bi besedilo pobili. Razlika med brisanjem in pobijanjem +besedila je le ta, da le slednje lahko povrnete z ukazom C-y. Preklic +ukaza pa velja za eno in drugo. * DATOTEKE @@ -493,638 +491,657 @@ C-y. Preklic ukaza pa velja za eno in drugo. Da bi bile spremembe v besedilu trajne, morate besedilo shraniti v datoteko. V nasprotnem primeru jih boste za vedno izgubili tisti hip, ko boste zapustili Emacs. Besedilo postavimo v datoteko tako, da -na disku ,,poiemo`` (angl. find) datoteko, preden zanemo tipkati -(pravimo tudi, da ,,obiemo`` datoteko). +na disku »poiščemo« (angl. find) datoteko, preden začnemo tipkati +(pravimo tudi, da »obiščemo« datoteko). Poiskati datoteko pomeni, da v Emacsu vidimo vsebino datoteke. To je bolj ali manj tako, kot da z Emacsom urejamo datoteko samo. Vendar pa spremembe ne postanejo trajne, dokler datoteke ne shranimo -(angl. save) na disk. Tako imamo monost, da se izognemo temu, da bi -nam na pol spremenjene datoteke leale po disku, kadar tega ne -elimo. Ker pa Emacs ohrani izvorno datoteko pod spremenjenim imenom, -lahko prvotno datoteko prikliemo nazaj celo e potem, ko smo datoteko -e shranili na disk. - -V predzadnji vrstici na dnu zaslona vidite vrstico, ki se zane in -kona z vezaji, in vsebuje niz znakov ,,--:-- TUTORIAL``. Ta del -zaslona navadno vsebuje ime datoteke, ki smo jo obiskali. Zdajle je to -,,TUTORIAL``, vaa delovna kopija ubenika Emacsa. Ko boste poiskali -kakno drugo datoteko, bo na tem mestu pisalo njeno ime. +(angl. save) na disk. Tako imamo možnost, da se izognemo temu, da bi +nam na pol spremenjene datoteke ležale po disku, kadar tega ne +želimo. Ker pa Emacs ohrani izvorno datoteko pod spremenjenim imenom, +lahko prvotno datoteko prikličemo nazaj celo še potem, ko smo datoteko +že shranili na disk. + +V predzadnji vrstici na dnu zaslona vidite vrstico, ki se začne z +vezaji, na začetku pa vsebuje niz znakov »--:--- TUTORIAL« ali nekaj +podobnega. Ta del zaslona navadno vsebuje ime datoteke, ki smo jo +obiskali. Zdajle je to »TUTORIAL«, vaša delovna kopija učbenika +Emacsa. Ko boste poiskali kakšno drugo datoteko, bo na tem mestu +izpisano ime te datoteke. Posebnost ukaza za iskanje datoteke je, da moramo povedati, katero -datoteko iemo. Pravimo, da ukaz ,,prebere argument s terminala`` (v -tem primeru je argument ime datoteke). Ko vtipkate ukaz +datoteko iščemo. Pravimo, da ukaz »prebere argument« (v tem primeru je +argument ime datoteke). Ko vtipkate ukaz - C-x C-f (poii datoteko) + C-x C-f (poišči datoteko) -vas Emacs povpraa po imenu datoteke. Kar vtipkate, se sproti vidi v -vrstici na dnu zaslona. Temu delovnemu podroju pravimo pogovorni +vas Emacs povpraša po imenu datoteke. Kar vtipkate, se sproti vidi v +vrstici na dnu zaslona. Temu delovnemu področju pravimo pogovorni vmesnik (minibuffer), kadar se uporablja za tovrstni vnos. Znotraj -pogovornega vmesnika lahko uporabljate obiajne ukaze za urejanje, e +pogovornega vmesnika lahko uporabljate običajne ukaze za urejanje, če ste se na primer pri tipkanju zmotili. Sredi tipkanja imena datoteke (ali katerega koli drugega opravila v -pogovornem vmesniku) lahko ukaz prekliete s C-g. +pogovornem vmesniku) lahko ukaz prekličete s C-g. ->> Vtipkajte C-x C-f, zatem pa e C-g. Zadnji ukaz od treh je +>> Vtipkajte C-x C-f, zatem pa še C-g. Zadnji ukaz od treh je zaprl pogovorni vmesnik in tudi preklical ukaz C-x C-f, ki je uporabljal pogovorni vmesnik. Konec z iskanjem datoteke. -Ko ste dokonali ime, ga vnesete s pritiskom na . S tem se -poene ukaz C-x C-f in poie iskano datoteko. Pogovorni vmesnik -izgine, ko je ukaz izveden. +Ko ste dokončali ime, ga vnesete s pritiskom na . Pogovorni +vmesnik izgine, ko je ukaz izveden. -Trenutek kasneje se vsebina datoteke pojavi na zaslonu. Zdaj lahko -dopolnjujete, urejate ali kako drugae spreminjate vsebino. Ko elite, -da ostanejo spremembe trajne, izvedete ukaz: +Vsebina datoteke se pojavi na zaslonu. Zdaj lahko dopolnjujete, +urejate ali kako drugače spreminjate vsebino. Ko želite, da ostanejo +spremembe trajne, izvedete ukaz: C-x C-s (shrani datoteko) -Besedilo se s tem shrani iz pomnilnika raunalnika na datoteko na -disk. Ko prvi izvedete ta ukaz, se izvorna datoteka preimenuje, tako +Besedilo se s tem shrani iz pomnilnika računalnika na datoteko na +disk. Ko prvič izvedete ta ukaz, se izvorna datoteka preimenuje, tako da ni izgubljena. Najdete jo pod novim imenom, ki se od starega -razlikuje po tem, da ima na koncu pripet znak ,,~``. +razlikuje po tem, da ima na koncu pripet znak »~«. -Ko je Emacs shranil datoteko, izpie njeno ime. Shranjujte raje -pogosteje kot ne, da v primeru, e gre z raunalnikom kaj narobe, ne -izgubite veliko. +Ko je Emacs shranil datoteko, izpiše njeno ime. Shranjujte raje +pogosteje kot ne, da v primeru, če gre z računalnikom kaj narobe, ne +izgubite veliko (oglejte si tudi razdelek o samodejnem shranjevanju +nižje). ->> Vtipkajte C-x C-s, s imer boste shranili svojo kopijo tega - ubenika. Emacs bo v vrstici na dnu zaslona izpisal ,,Wrote - ...TUTORIAL``. +>> Vtipkajte C-x C-s TUTORIAL . + S tem boste shranili svojo kopijo tega učbenika. Emacs bo v vrstici + na dnu zaslona izpisal »Wrote ...TUTORIAL«. -Poiete lahko lahko e obstojeo datoteko, da si jo ogledate ali -popravite, ali pa tudi datoteko, ki e ne obstaja. To je nain, kako z -Emacsom ustvarimo novo datoteko: poiite datoteko z izbranim imenom, -ki bo sprva prazna, in zanite pisati. Ko jo boste prvi shranili, bo -Emacs ustvaril datoteko z vneenim besedilom. Od tod dalje delate na -e obstojei datoteki. +Poiščete lahko lahko že obstoječo datoteko, da si jo ogledate ali +popravite, ali pa tudi datoteko, ki še ne obstaja. To je način, kako z +Emacsom ustvarimo novo datoteko: poiščite datoteko z izbranim imenom, +ki bo sprva prazna, in začnite pisati. Ko jo boste prvič shranili, bo +Emacs ustvaril datoteko z vnešenim besedilom. Od tod dalje delate na +že obstoječi datoteki. -* DELOVNA PODROJA +* DELOVNA PODROČJA ------------------ -Tudi e ste z ukazom C-x C-f poiskali in odprli drugo datoteko, prva -ostane v Emacsu. Nanjo se vrnete tako, da jo e enkrat ,,poiete`` z +Tudi če ste z ukazom C-x C-f poiskali in odprli drugo datoteko, prva +ostane v Emacsu. Nanjo se vrnete tako, da jo še enkrat »poiščete« z ukazom C-x C-f. Tako imate lahko v Emacsu hkrati kar precej datotek. ->> Ustvarite datoteko z imenom ,,bla`` tako, da vtipkate C-x C-f - bla . Natipkajte nekaj besedila, ga po potrebi popravite, in - shranite v datoteko ,,bla`` z ukazom C-x C-s. Ko ste konali, se - vrnite v ubenik z ukazom C-x C-f TUTORIAL . - -Emacs hrani besedilo vsake datoteke v takoimenovanem ,,delovnem -podroju`` (angl. buffer). Ko poiemo datoteko, Emacs ustvari zanjo -novo delovno podroje. Vsa obstojea delovna podroja v Emacsu vidimo +Emacs hrani besedilo vsake datoteke v takoimenovanem »delovnem +področju« (angl. buffer). Ko poiščemo datoteko, Emacs ustvari zanjo +novo delovno področje. Vsa obstoječa delovna področja v Emacsu vidimo z ukazom: - C-x C-b Seznam delovnih podroij. + C-x C-b Seznam delovnih področij. >> Poskusite C-x C-b zdaj. -Vidite, da ima vsako delovno podroje svoje ime, pri nekaterih pa pie +Vidite, da ima vsako delovno področje svoje ime, pri nekaterih pa piše tudi ime datoteke, katere vsebina se hrani v njem. Vsako besedilo, ki -ga vidite v katerem od Emacsovih oken, je vedno del kaknega delovnega -podroja. +ga vidite v katerem od Emacsovih oken, je vedno del kakšnega delovnega +področja. ->> Z ukazom C-x 1 se znebite seznama delovnih podroij. +>> Z ukazom C-x 1 se znebite seznama delovnih področij. -Tudi e imate ve delovnih podroij, pa je vedno le eno od njih -trenutno dejavno. To je tisto delovno podroje, ki ga popravljate. e -elite popravljati drugo delovno podroje, morate ,,preklopiti`` -nanj. e bi radi preklopili na delovno podroje, ki pripada kakni -datoteki, e poznate en nain, kako to storiti: ponovno ,,obiete`` -(odprete) to datoteko z ukazom C-x C-f. Obstaja pa e laji nain: z -ukazom C-x b. Pri tem ukazu morate navesti ime delovnega podroja. +Tudi če imate več delovnih področij, pa je vedno le eno od njih +trenutno dejavno. To je tisto delovno področje, ki ga popravljate. Če +želite popravljati drugo delovno področje, morate »preklopiti« +nanj. Če bi radi preklopili na delovno področje, ki pripada kakšni +datoteki, že poznate en način, kako to storiti: ponovno »obiščete« +(odprete) to datoteko z ukazom C-x C-f. Obstaja pa še lažji način: z +ukazom C-x b. Pri tem ukazu morate navesti ime delovnega področja. ->> Vtipkajte C-x b bla , s imer se vrnete v delovno podroje - ,,bla`` z vsebino datoteke ,,bla``, ki ste jo maloprej - odprli. Zatem vtipkajte C-x b TUTORIAL , s imer se vrnete - nazaj v ta ubenik. +>> Ustvarite datoteko z imenom »bla« tako, da vtipkate C-x C-f bla + . Zatem se vrnite v ta učbenik z ukazom C-x C-f TUTORIAL + . -Veinoma se ime delovnega podroja kar ujema z imenom datoteke (brez -poti do datoteke), ne pa vedno. Seznam delovnih podroij, ki ga -prikae ukaz C-x C-b, prikae imena vseh delovnih podroij. +Večinoma se ime delovnega področja kar ujema z imenom datoteke (brez +poti do datoteke), ne pa vedno. Seznam delovnih področij, ki ga +prikaže ukaz C-x C-b, prikaže imena vseh delovnih področij in +pripadajoča imena datotek. Vsako besedilo, ki ga vidite v katerem od Emacsovih oken, je vedno del -kaknega delovnega podroja. Nekatera delovna podroja ne pripadajo -nobeni datoteki. Podroje ,,*Buffer List*``, na primer, je e eno -takih. To delovno podroje smo ustvarili ravnokar, ko smo pognali ukaz -C-x C-b, in vsebuje seznam delovnih podroij. Tudi delovno podroje -,,Messages`` ne pripada nobeni datoteki, ampak vsebuje sporoila, ki -jih je Emacs izpisoval v odzivnem podroju na dnu zaslona. - ->> Vtipkajte C-x b *Messages* in si oglejte delovno podroje - s sporoili, zatem pa vtipkajte C-x b TUTORIAL in se tako - vrnite v ubenik. - -e ste spreminjali besedilo ene datoteke, potem pa poiskali drugo, to +kakšnega delovnega področja. Nekatera delovna področja ne pripadajo +nobeni datoteki. Področje »*Buffer List*«, na primer, je že eno takih. +To delovno področje smo ustvarili ravnokar, ko smo pognali ukaz C-x +C-b, in vsebuje seznam delovnih področij. Temu delovnemu področju +TUTORIAL sprva ni pripadala datoteka, zdaj pa mu, ker smo v prejšnjem +razdelku vtipkali C-x C-s in ga shranili v datoteko. + +Tudi delovno področje »Messages« ne pripada nobeni datoteki, ampak +vsebuje sporočila, ki jih je Emacs izpisoval v odzivnem področju na +dnu zaslona. + +>> Vtipkajte C-x b *Messages* in si oglejte delovno področje + s sporočili, zatem pa vtipkajte C-x b TUTORIAL in se tako + vrnite v učbenik. + +Če ste spreminjali besedilo ene datoteke, potem pa poiskali drugo, to ne shrani spremeb v prvo datoteko. Te ostanejo znotraj Emacsa, na -delovnem podroju, ki pripada prvi datoteki. Ustvarjenje ali -spreminjanje delovnega podroja druge datoteke nima nobenega vpliva na -podroje prve. To je zelo uporabno, pomeni pa tudi, da potrebujemo -udobno pot, da shranimo delovno podroje prve datoteke. Nerodno bi -bilo preklapljanje na prvo podroje s C-x C-f, da bi shranili s C-x +delovnem področju, ki pripada prvi datoteki. Ustvarjenje ali +spreminjanje delovnega področja druge datoteke nima nobenega vpliva na +področje prve. To je zelo uporabno, pomeni pa tudi, da potrebujemo +udobno pot, da shranimo delovno področje prve datoteke. Nerodno bi +bilo preklapljanje na prvo področje s C-x C-f, da bi shranili s C-x C-s. Namesto tega imamo: - C-x s Shrani nekatera delovna podroja + C-x s Shrani nekatera delovna področja -Ukaz C-x poie delovna podroja, katerih vsebina je bila spremenjena, -odkar je bila zadnji shranjena na datoteko. Za vsako tako delovno -podroje C-x s vpraa, e ga elite shraniti. +Ukaz C-x poišče delovna področja, katerih vsebina je bila spremenjena, +odkar je bila zadnjič shranjena na datoteko. Za vsako tako delovno +področje C-x s vpraša, če ga želite shraniti. -* RAZIRJEN NABOR UKAZOV +* RAZŠIRJEN NABOR UKAZOV ------------------------ -e mnogo, mnogo je ukazov Emacsa, ki bi zasluili, da jih obesimo na +Še mnogo, mnogo je ukazov Emacsa, ki bi zaslužili, da jih obesimo na razne kontrolne in meta znake. Emacs se temu izogne z ukazom X (iz angl. -eXtend - raziriti), ki uvede ukaz iz razirjenega nabora. Dveh vrst je: +eXtend - razširiti), ki uvede ukaz iz razširjenega nabora. Dveh vrst je: - C-x Znakovna raziritev (angl. Character eXtend). + C-x Znakovna razširitev (angl. Character eXtend). Sledi mu en sam znak. - M-x Raziritev s poimenovanim ukazom. Sledi mu dolgo ime + M-x Razširitev s poimenovanim ukazom. Sledi mu dolgo ime ukaza. -Tudi ti ukazi so na splono uporabni, ne uporabljamo pa jih tako -pogosto kot tiste, ki ste se jih e nauili. Dva ukaza iz razirjenega -nabora e poznamo: C-x C-f, s katerim poiemo datoteko, in C-x C-s, s -katerim datoteko shranimo. e en primer je ukaz, s katerim Emacsu -povemo, da elimo konati z delom iz iziti iz Emacsa. Ta ukaz je C-x -C-c (ne skrbite: preden kona, Emacs ponudi, da shrani vse spremenjene +Tudi ti ukazi so na splošno uporabni, ne uporabljamo pa jih tako +pogosto kot tiste, ki ste se jih že naučili. Dva ukaza iz razširjenega +nabora že poznamo: C-x C-f, s katerim poiščemo datoteko, in C-x C-s, s +katerim datoteko shranimo. Še en primer je ukaz, s katerim Emacsu +povemo, da želimo končati z delom iz iziti iz Emacsa. Ta ukaz je C-x +C-c (ne skrbite: preden konča, Emacs ponudi, da shrani vse spremenjene datoteke). -Z ukazom C-z Emacs zapustimo samo *zaasno*, tako da lahko ob vrnitvi -nadaljujemo z delom, kjer smo ostali. +Če uporabljate grafični vmesnik, ne potrebujete posebnega ukaza za +preklop iz Emacsa v katerikoli drug program, ampak to opravite z miško +ali ukazom upravljalnika oken. Če pa uporabljate besedilni terminal, +ki lahko prikazuje le en program naenkrat, morate začasno zapustiti +Emacs, da preklopite na drug program. -Na sistemih, ki to dopuajo, ukaz C-z izide iz Emacsa v ukazno -lupino, a ga ne kona - e uporabljate ukazno lupino C, se lahko -vrnete z ukazom ,fg` ali sploneje z ukazom ,,%emacs``. +Z ukazom C-z Emacs zapustimo samo *začasno*, tako da lahko ob vrnitvi +nadaljujemo z delom, kjer smo ostali. Na sistemih, ki to dopuščajo, +ukaz C-z izide iz Emacsa v ukazno lupino, a ga ne konča - če +uporabljate ukazno lupino C, se lahko vrnete z ukazom »fg« ali +splošneje z ukazom »%emacs«. -Drugod ukaz C-z poene sekundarno ukazno lupino, tako da lahko -poenete kaken drug program in se kasneje vrnete v Emacs. V tem -primeru pravzaprav Emacsa ne zapustimo. Ukaz ,,exit`` v ukazni lupini -je navadno nain, da zapremo sekundarno lupino in se vrnemo v Emacs. +Drugod ukaz C-z požene sekundarno ukazno lupino, tako da lahko +poženete kakšen drug program in se kasneje vrnete v Emacs. V tem +primeru pravzaprav Emacsa ne zapustimo. Ukaz »exit« v ukazni lupini +je navadno način, da zapremo sekundarno lupino in se vrnemo v Emacs. -Ukaz C-x C-c uporabimo, e se nameravamo odjaviti s sistema. To je -tudi pravilen nain za izhod iz Emacsa, e je tega pognal program za -delo s poto ali kak drug program, saj ta verjetno ne ve, kaj -napraviti z zaasno prekinjenim Emacsom. V vseh ostalih primerih pa, -e se ne nameravate odjaviti s sistema, uporabite C-z, in se vrnite v -Emacs, ko bi radi spet urejali besedilo. +Ukaz C-x C-c uporabimo, če se nameravamo odjaviti s sistema. To je +tudi pravilen način za izhod iz Emacsa, če je tega pognal program za +delo s pošto ali kak drug program. Ukazov C-x je veliko. Zaenkrat smo spoznali naslednje: - C-x C-f Poii datoteko. + C-x C-f Poišči datoteko. C-x C-s Shrani datoteko. - C-x C-b Prikai seznam delovnih podroij. - C-x C-c Konaj Emacs. + C-x C-b Prikaži seznam delovnih področij. + C-x C-c Končaj Emacs. C-x 1 Zapri vsa okna razen enega. C-x u Preklic zadnjega ukaza. -Poimenovani razirjeni ukazi so ukazi, ki se uporabljajo e bolj -poredko, ali pa se uporabljajo samo v nekaterih nainih dela. Eden +Poimenovani razširjeni ukazi so ukazi, ki se uporabljajo še bolj +poredko, ali pa se uporabljajo samo v nekaterih načinih dela. Eden takih je na primer ukaz replace-string, ki po vsem besedilu zamenja en -niz znakov z drugim. Ko vtipkate M-x, se to izpie v pogovornem -vmesniku na dnu zaslona, Emacs pa aka, da vtipkate ime ukaza, ki ga -elite priklicati; v tem primeru je to ,,replace-string``. Vtipkajte -samo ,,repl s`` in Emacs bo dopolnil ime ( je tabulatorska +niz znakov z drugim. Ko vtipkate M-x, se to izpiše v pogovornem +vmesniku na dnu zaslona, Emacs pa čaka, da vtipkate ime ukaza, ki ga +želite priklicati; v tem primeru je to »replace-string«. Vtipkajte +samo »repl s« in Emacs bo dopolnil ime ( je tabulatorska tipka; navadno jo najdemo nad tipko Caps Lock ali Shift na levi strani tipkovnice). Ukaz vnesete s pritiskom na . -Ukaz replace-string potrebuje dva argumenta -- niz, ki ga elite +Ukaz replace-string potrebuje dva argumenta -- niz, ki ga želite zamenjati, in niz, s katerim bi radi zamenjali prvega. Vsakega posebej -vnesete in zakljuite s pritiskom na tipko Return. +vnesete in zaključite s pritiskom na tipko Return. ->> Premaknite kazalek na prazno vrstico dve vrstici pod to, zatem +>> Premaknite kazalček na prazno vrstico dve vrstici pod to, zatem vtipkajte M-x repl szamenjalaspremenila. Opazite, kako se je ta vrstica zamenjala? Vse besede z-a-m-e-n-j-a-l-a od tod do konca besedila ste nadomestili z besedo - ,,spremenila``. + »spremenila«. -* AVTOMATINO SHRANJEVANJE +* AVTOMATIČNO SHRANJEVANJE -------------------------- -Spremembe v datoteki, ki jih e niste shranili na disk, so izgubljene, -e medtem denimo zmanjka elektrike. Da bi vas zavaroval pred tem, -Emacs periodino avtomatino shrani vse datoteke, ki jih -urejate. Avtomatino shranjena datoteka se od izvorne razlikuje po -znaku ,#` na zaetku in koncu imena: e se je vaa datoteka imenovala -,,hello.c``, se avtomatino shranjena datoteka imenuje -,,#hello.c#``. Ko normalno shranite datoteko, avtomatino shranjena -datoteka ni ve potrebna, in Emacs jo pobrie. +Spremembe v datoteki, ki jih še niste shranili na disk, so izgubljene, +če medtem denimo zmanjka elektrike. Da bi vas zavaroval pred tem, +Emacs periodično avtomatično shrani vse datoteke, ki jih +urejate. Avtomatično shranjena datoteka se od izvorne razlikuje po +znaku »#« na začetku in koncu imena: če se je vaša datoteka imenovala +»hello.c«, se avtomatično shranjena datoteka imenuje +»#hello.c#«. Ko normalno shranite datoteko, avtomatično shranjena +datoteka ni več potrebna, in Emacs jo pobriše. -e res pride do izgube podatkov v pomnilniku, lahko povrnete avtomatino -shranjeno besedilo tako, da normalno poiete datoteko (pravo ime -datoteke, ne ime avtomatino shranjene datoteke), zatem pa vtipkate M-x -recover file. Ko vas vpraa za potrditev, vtipkajte yes -za nadaljevanje in povrnitev avtomatino shranjenenih podatkov. +Če res pride do izgube podatkov v pomnilniku, lahko povrnete avtomatično +shranjeno besedilo tako, da normalno poiščete datoteko (pravo ime +datoteke, ne ime avtomatično shranjene datoteke), zatem pa vtipkate M-x +recover-file . Ko vas vpraša za potrditev, vtipkajte yes +za nadaljevanje in povrnitev avtomatično shranjenenih podatkov. -* ODZIVNO PODROJE +* ODZIVNO PODROČJE ------------------ -Kadar Emacs opazi, da poasi vtipkavate ukaz, odpre v zadnji vrstici -na dnu zaslona odzivno podroje in v njem sproti prikazuje natipkano. +Kadar Emacs opazi, da počasi vtipkavate ukaz, odpre v zadnji vrstici +na dnu zaslona odzivno področje in v njem sproti prikazuje natipkano. * STATUSNA VRSTICA ------------------ -Vrstica nad odzivnim podrojem je statusna vrstica. Ta kae verjetno +Vrstica nad odzivnim področjem je statusna vrstica. Ta kaže verjetno nekaj podobnega kot: ---:** TUTORIAL (Fundamental)--L670--58%---------------------- +--:**- TUTORIAL (Fundamental)--L670--58%---------------------- V njej so izpisani pomembni podatki o stanju Emacsa in besedilu, ki ga urejate. -Zdaj e veste, kaj pomeni ime datoteke -- to je datoteka, ki ste jo -poiskali. Oznaka --NN%-- pomeni, da je nad vrhom zaslona e NN -odstotkov celotne datoteke. e je zaetek datoteke na zaslonu, bo -namesto --00%-- pisalo --Top--. Podobno bo pisalo --Bot--, e je -zadnja vrstica datoteke na zaslonu. e je datoteka, ki jo ogledujete, -tako kratka, da gre vsa na en zaslon, pa bo pisalo --All--. +Zdaj že veste, kaj pomeni ime datoteke -- to je datoteka, ki ste jo +poiskali. Oznaka --NN%-- pomeni, da je nad vrhom zaslona še NN +odstotkov celotne datoteke. Če je začetek datoteke na zaslonu, bo +namesto »0%« pisalo »Top«. Podobno bo pisalo »Bot«, če je +zadnja vrstica datoteke na zaslonu. Če je datoteka, ki jo ogledujete, +tako kratka, da gre vsa na en zaslon, pa bo pisalo »All«. -rka L in tevilke za njo kaejo poloaj e drugae, kot zaporedno -tevilko vrstice, v kateri je kazalek. +Črka L in številke za njo kažejo položaj še drugače, kot zaporedno +številko vrstice, v kateri je kazalček. -Zvezdice na zaetku vrstice pomenijo, da ste datoteko e spreminjali. +Zvezdice na začetku vrstice pomenijo, da ste datoteko že spreminjali. Tik po tem, ko ste odprli ali shranili datoteko, ni nobenih zvezdic, -so samo rtice. +so samo črtice. -Del statusne vrstice znotraj oklepajev vam pove, v kaknem nainu dela -Emacs. Privzeti nain je osnovni nain (Fundamental), v katerem ste -sedaj. Fundamental je eden od glavnih nainov (angl. major -mode). Emacs pozna veliko razlinih glavnih nainov. Nekateri od njih +Del statusne vrstice znotraj oklepajev vam pove, v kakšnem načinu dela +Emacs. Privzeti način je osnovni način (Fundamental), v katerem ste +sedaj. Fundamental je eden od glavnih načinov (angl. major +mode). Emacs pozna veliko različnih glavnih načinov. Nekateri od njih so namenjeni pisanju programov, kot na primer Lisp, ali pisanju -besedil, kot npr. Text. Naenkrat je lahko aktiven le en glavni nain, -njegovo ime pa je vedno izpisano v statusni vrstici, kjer zdaj pie +besedil, kot npr. Text. Naenkrat je lahko aktiven le en glavni način, +njegovo ime pa je vedno izpisano v statusni vrstici, kjer zdaj piše Fundamental. -Glavni naini lahko spremenijo pomen nekaterim ukazom. Obstajajo, +Glavni načini lahko spremenijo pomen nekaterim ukazom. Obstajajo, denimo, ukazi za pisanje komentarjev v programu, in ker ima vsak programski jezik svoje predstave o tem, kako mora komentar izgledati, -mora vsak glavni nain vnesti komentarje drugae. Ker je vsak glavni -nain ime razirjenega ukaza, lahko tako tudi izbiramo glavni -nain. Na primer, M-x fundamental-mode vas postavi v nain +mora vsak glavni način vnesti komentarje drugače. Ker je vsak glavni +način ime razširjenega ukaza, lahko tako tudi izbiramo glavni +način. Na primer, M-x fundamental-mode vas postavi v način Fundamental. -e nameravate popravljati slovensko (ali angleko) besedilo, kot je na -primer tole, boste verjetno izbrali tekstovni nain (Text). ->> Vtipkajte M-x text mode. +Če nameravate popravljati slovensko (ali angleško) besedilo, kot je na +primer tole, boste verjetno izbrali tekstovni način (Text). +>> Vtipkajte M-x text-mode . -Brez skrbi, noben od ukazov Emacsa, ki ste se jih nauili, se s tem ne -spremeni kaj dosti. Lahko pa opazite, da Emacs zdaj jemlje opuaje za -dele besed, ko se premikate z M-f ali M-b. V osnovnem nainu jih je +Brez skrbi, noben od ukazov Emacsa, ki ste se jih naučili, se s tem ne +spremeni kaj dosti. Lahko pa opazite, da Emacs zdaj jemlje opuščaje za +dele besed, ko se premikate z M-f ali M-b. V osnovnem načinu jih je obravnaval kot meje med besedami. -Glavni naini navadno poenjajo majhne spremembe, kot je ta: veina -ukazov ,,opravi isti posel``, vendar pa to ponejo na razlien nain. +Glavni načini navadno počenjajo majhne spremembe, kot je ta: večina +ukazov »opravi isti posel«, vendar pa to počnejo na različen način. -Dokumentacijo o trenutno aktivnem glavnem nainu dobite z ukazom C-h m. +Dokumentacijo o trenutno aktivnem glavnem načinu dobite z ukazom C-h m. ->> Uporabite C-u C-v enkrat ali vekrat, toliko, da bo ta vrstica blizu - vrha zaslona. ->> Vtipkajte C-h m, da vidite, v em se tekstovni nain (Text) razlikuje +>> Vtipkajte C-l C-l, da postavite to vrstico na vrh zaslona. +>> Vtipkajte C-h m, da vidite, v čem se tekstovni način (Text) razlikuje od osnovnega (Fundamental). >> Vtipkajte C-x 1, da umaknete dokumentacijo z zaslona. -Glavnim nainom pravimo glavni naini zato, ker obstajajo tudi -podnaini (angl. minor modes). Podnaini ne nadomeajo glavnih -nainom, ampak le spreminjajo njihovo obnaanje. Podnaine lahko -aktiviramo ali deaktiviramo neodvisno od glavnega naina in neodvisno -od ostalih podnainov. Tako lahko ne uporabljate nobenega podnaina, -en podnain, ali kombinacijo veih podnainov. +Glavnim načinom pravimo glavni načini zato, ker obstajajo tudi +podnačini (angl. minor modes). Podnačini ne nadomeščajo glavnih +načinom, ampak le spreminjajo njihovo obnašanje. Podnačine lahko +aktiviramo ali deaktiviramo neodvisno od glavnega načina in neodvisno +od ostalih podnačinov. Tako lahko ne uporabljate nobenega podnačina, +en podnačin, ali kombinacijo večih podnačinov. -Podnain, ki je zelo uporaben posebno za pisanje besedil, je Auto -Fill. Ko je vklopljen, Emacs med pisanjem avtomatino deli vrstice na +Podnačin, ki je zelo uporaben posebno za pisanje besedil, je Auto +Fill. Ko je vklopljen, Emacs med pisanjem avtomatično deli vrstice na presledkih med besedami, tako da vrstice niso predolge. -Vklopite ga lahko z ukazom M-x auto fill mode. Ko je -vklopljen, ga lahko izklopite z istim ukazom, M-x -auto fill mode. Z istim ukazom torej preklapljamo -(angl. toggle) med vklopljenim in izklopljenim stanjem. +Vklopite ga lahko z ukazom M-x auto-fill-mode . Ko je +vklopljen, ga lahko izklopite z istim ukazom, M-x auto-fill-mode +. Z istim ukazom torej preklapljamo (angl. toggle) med +vklopljenim in izklopljenim stanjem. ->> Vtipkajte zdaj M-x auto fill mode. Potem zanite tipkati - "asdf asdkl sdjf sdjkf"... dokler ne opazite, da je Emacs razbil +>> Vtipkajte zdaj M-x auto-fill-mode . Potem začnite tipkati + »asdf asdkl sdjf sdjkf«... dokler ne opazite, da je Emacs razbil vrstico na dve. Med tipkanjem mora biti dovolj presledkov, saj Auto Fill prelamlja vrstice samo na presledkih. -irina besedila je navadno postavljena na 70 znakov, kar pa lahko -spremenite z ukazom C-x f. Novo irino morate podati kot tevilni +Širina besedila je navadno postavljena na 70 znakov, kar pa lahko +spremenite z ukazom C-x f. Novo širino morate podati kot številčni argument. >> Vtipkajte C-x f in argument 20. (C-u 2 0 C-x f). Zatem vtipkajte - nekaj besedila in poglejte, e bo Emacs res delil vrstice pri 20 + nekaj besedila in poglejte, če bo Emacs res delil vrstice pri 20 znakih. Potem z ukazom C-x f postavite mejo nazaj na 70. -Auto Fill deluje le, kadar piete novo besedilo, ne pa, -kadar popravljate e napisan odstavek. -Tak odstavek lahko poravnate tako, da kazalek premaknete nekam -znotraj odstavka in ukaete M-q (META-q). +Auto Fill deluje le, kadar pišete novo besedilo, ne pa, +kadar popravljate že napisan odstavek. +Tak odstavek lahko poravnate tako, da kazalček premaknete nekam +znotraj odstavka in ukažete M-q (META-q). ->> Premaknite kazalek v prejnji odstavek in izvedite M-q. +>> Premaknite kazalček v prejšnji odstavek in izvedite M-q. * ISKANJE --------- -Emacs lahko v besedilu poie niz znakov (zaporedje znakov ali besed), -naprej ali nazaj po besedilu. Iskanje spada v skupino ukazov za -premikanje kazalka, saj premakne kazalek na kraj v besedilu, kjer je -nael iskani niz. +Emacs lahko v besedilu poišče niz znakov (»niz« je zaporedje soslednih +znakov), naprej ali nazaj po besedilu. Iskanje spada v skupino ukazov +za premikanje kazalčka, saj premakne kazalček na kraj v besedilu, kjer +je našel iskani niz. -Iskanje v Emacsu je morda nekoliko drugano od tistega, ki ste ga -navajeni, in sicer je ,,inkrementalno``. To pomeni, da se iskanje -odvija hkrati s tem, ko tipkate iskani niz. +Iskanje v Emacsu je »inkrementalno«. To pomeni, da se iskanje odvija +hkrati s tem, ko tipkate iskani niz. Ukaza za iskanje sta C-s za iskanje naprej po datoteki in C-r za -iskanje nazaj po datoteki. POAKAJTE! Ne preizkuajte jih e ta hip! +iskanje nazaj po datoteki. POČAKAJTE! Ne preizkušajte jih še ta hip! -Ko boste natipkali C-s, boste opazili niz ,,I-search`` kot pozivnik +Ko boste natipkali C-s, boste opazili niz »I-search« kot pozivnik v pogovornem vmesniku. To vam pove, da je Emacs v inkrementalnem iskanju -in vas aka, da zanete tipkati, kar iete. zakljui iskanje. - ->> Pritisnite zdaj C-s. POASI, rko za rko, vtipkajte besedo - ,,kazalek``. Za vsako vtipkano rko se ustavite in si oglejte, kaj - se je zgodilo s kazalkom. ->> e enkrat pritisnite C-s, da poiete naslednji ,,kazalek``. ->> estkrat pritisnite in opazujte, kako se premika kazalek. ->> Konajte iskanje s tipko . - -Ste videli, kaj se je zgodilo? Emacs pri inkrementalnem iskanju skua -poiskati niz, ki ste ga natipkali do tistega hipa. Da poiete -naslednje mesto, kjer se pojavi ,,kazalek``, samo e enkrat -pritisnete C-s. e takega mesta ni, Emacs ivkne in vam sporoi, da +in vas čaka, da začnete tipkati, kar iščete. zaključi iskanje. + +>> Pritisnite zdaj C-s. POČASI, črko za črko, vtipkajte besedo + »kazalček«. Za vsako vtipkano črko se ustavite in si oglejte, kaj + se je zgodilo s kazalčkom. +>> Še enkrat pritisnite C-s, da poiščete naslednji »kazalček«. +>> Šestkrat pritisnite in opazujte, kako se premika kazalček. +>> Končajte iskanje s tipko . + +Ste videli, kaj se je zgodilo? Emacs pri inkrementalnem iskanju skuša +poiskati niz, ki ste ga natipkali do tistega hipa. Da poiščete +naslednje mesto, kjer se pojavi »kazalček«, samo še enkrat +pritisnete C-s. Če takega mesta ni, Emacs čivkne in vam sporoči, da iskanje ni uspelo. Tudi C-g prekine iskanje. -OPOZORILO: Na nekaterih sistemih bo s pritiskom na C-s ekran -zmrznil. To je znak, da je operacijski sistem prestregel znak C-s in -ga interpretiral kot znak za prekinitev toka podatkov, namesto da bi -ga posredoval programu Emacs. Ekran ,,odtajate`` s pritiskom na -C-q. Potem si oglejte razdelek ,,Spontaneous Entry to Incremental -Search`` v prironiku za nasvet, kako se spopasti s to nevenostjo. - -e sredi inkrementalnega iskanja pritisnete , boste opazili, -da to pobrie zadnji znak v iskanem nizu, kazalek pa se premakne -nazaj na mesto v besedilu, kjer je nael kraji niz. Na primer, -predpostavimo, da ste do zdaj natipkali ,,ka`` in je kazalek na -mestu, kjer se prvi pojavi ,,ka``. e zdaj pritisnete , boste -s tem v pogovornem vmesniku izbrisali ,a`, hkrati pa se bo kazalek -postavil na mesto, kjer je prvi nael ,k`, preden ste natipkali e -,a`. - -e sredi iskanja vtipkate katerikoli kontrolni znaki ali metaznak +Če sredi inkrementalnega iskanja pritisnete , boste opazili, +da to pobriše zadnji znak v iskanem nizu, kazalček pa se premakne +nazaj na mesto v besedilu, kjer je našel krajši niz. Na primer, +predpostavimo, da ste do zdaj natipkali »ka« in je kazalček na +mestu, kjer se prvič pojavi »ka«. Če zdaj pritisnete , boste +s tem v pogovornem vmesniku izbrisali »a«, hkrati pa se bo kazalček +postavil na mesto, kjer je prvič našel »k«, preden ste natipkali še +»a«. + +Če sredi iskanja vtipkate katerikoli kontrolni znaki ali metaznak (razen tistih, ki imajo poseben pomen pri iskanju, to sta C-s in C-r), se iskanje prekine. -C-s zane iskati na mestu v datoteki, kjer trenutno stoji kazalek, in -ie do konca datoteke. e bi radi iskali proti zaetku datoteke, +C-s začne iskati na mestu v datoteki, kjer trenutno stoji kazalček, in +išče do konca datoteke. Če bi radi iskali proti začetku datoteke, namesto C-s vtipkamo C-r. Vse, kar smo povedali o ukazu C-s, velja tudi za C-r, le smer iskanja je obrnjena. -* VE OKEN NA ZASLONU +* VEČ OKEN NA ZASLONU --------------------- -Ena simpatinih lastnosti Emacsa je, da zna hkrati prikazati ve oken -na ekranu, tudi e ne delamo v grafinem nainu. +Ena simpatičnih lastnosti Emacsa je, da zna hkrati prikazati več oken +na zaslonu, tudi če ne delamo v grafičnem načinu. (Opozorimo naj, da +Emacs uporablja izraz »okvir« (angl. »frame«) - razložen je v +naslednjem razdelku - za tisto, čemur nekateri drugi programi pravijo +»okno« (angl. »window«). Priročnik za Emacs vsebuje glosar +uporabljenih izrazov.) ->> Premaknite kazalek v to vrstico in vtipkajte C-u 0 C-l (zadnji - znak je CONTROL-L, ne CONTROL-1) +>> Premaknite kazalček v to vrstico in vtipkajte C-l C-l. >> Zdaj vtipkajte C-x 2, da razdelite zaslon na dve okni. - V obeh oknih imate odprt ta prironik. Kazalek je ostal v zgornjem + V obeh oknih imate odprt ta priročnik. Kazalček je ostal v zgornjem oknu. >> Pritisnite C-M-v za listanje v spodnjem oknu. - (e nimate tipke META, tipkajte ESC C-v). ->> Vtipkajte C-x o (o kot ,,other``, drugi), da preselite kazalek v + (Če nimate tipke META, tipkajte ESC C-v). +>> Vtipkajte C-x o (o kot »other«, drugi), da preselite kazalček v spodnje okno. ->> S C-v in M-v se v spodnjem oknu premikate po vsebini datoteke. - Zgornje okno e vedno kae ta navodila. ->> Ponovni C-x o vas vrne v zgornje okno. Kazalek se je vrnil na - mesto, kjer je bil, preden smo skoili v spodnje okno. +>> Z ukazoma C-v in M-v se v spodnjem oknu premikate po vsebini + datoteke. Zgornje okno še vedno kaže ta navodila. +>> Ponovni C-x o vas vrne v zgornje okno. Kazalček se je vrnil na + mesto, kjer je bil, preden smo skočili v spodnje okno. -Z ukazom C-x o lahko preklapljamo med okni. Vsako okno si zapomni, kje -v oknu je ostal kazalek, samo trenutno aktivno okno pa kazalek tudi -v resnici prikae. Vsi obiajni ukazi za urejanje, ki smo se jih -nauili, veljajo za aktivno okno. +Z ukazom C-x o lahko preklapljamo med okni. Izbrano okno, torej tisto, +v katerem urejamo besedilo, je tisto z zelo opaznim kazalčkom, ki +utripa, kadar ne tipkamo. Tudi ostala okna pa si zapomnijo, kje je +ostal kazalček. Če poganjate Emacs v grafičnem načinu, je položaj +kazalčka v teh oknih prikazan kot ne-utripajoč črtni pravokotnik. Ukaz C-M-v je zelo uporaben, kadar urejamo besedilo v enem oknu, -drugega pa uporabljamo samo za pomo. Kazalek ostaja ves as v oknu, -v katerem urejamo, po vsebini spodnjega okna pa se vseeno lahko -premikamo, ne da bi morali venomer skakati iz enega okna v drugega. +drugega pa uporabljamo samo za pomoč. Ne da bi zapustili izbrano okno, +se lahko premikamo po vsebini drugega okna z ukazon C-M-v. -C-M-v je primer znaka CONTROL-META. e imate v resnici tipko META (na -PC navadno levi Alt), lahko vtipkate C-M-v tako, da drite pritisnjeni +C-M-v je primer znaka CONTROL-META. Če imate v resnici tipko META (na +PC navadno levi Alt), lahko vtipkate C-M-v tako, da držite pritisnjeni tako CONTROL kot META, medtem ko vtipkate v. Ni pomembno, katero od -tipk, CONTROL ali META, pritisnete prvo, saj obe delujeta ele, ko -pritisnete znak, ki sledi (v zgornjem primeru ,v`). +tipk, CONTROL ali META, pritisnete prvo, saj obe delujeta šele, ko +pritisnete znak, ki sledi (v zgornjem primeru »v«). -Nasprotno pa je vrstni red pritiskanja pomemben, e nimate tipke META -in namesto nje uporabljate ESC. V tem primeru morate najprej -pritisniti ESC, potem pa Control-v. Obratna kombinacija, CONTROL-ESC v -ne deluje. To je zato, ker je ESC znak sam po sebi, ne pa modifikator, -kot sta CONTROL in META. +Nasprotno pa je vrstni red pritiskanja pomemben, če nimate tipke META +in namesto nje uporabljate . V tem primeru morate najprej +pritisniti , potem pa Control-v. Obratna kombinacija, +CONTROL- ne deluje. To je zato, ker je znak sam po sebi, ne +pa modifikator, kot sta CONTROL in META. >> V zgornjem oknu vtipkajte C-x 1, da se znebite spodnjega okna. -(e bi vtipkali C-x 1 v spodnjem oknu, bi se znebili -zgornjega. Razmiljajte o tem ukazu kot ,,Obdri samo eno okno, in -sicer tisto, v katerem sem zdaj.``) +(Če bi vtipkali C-x 1 v spodnjem oknu, bi se znebili +zgornjega. Razmišljajte o tem ukazu kot »Obdrži samo eno okno, in +sicer tisto, v katerem sem zdaj.«) -Seveda ni nujno, da obe okni kaeta isto delovno podroje. e v enem -oknu izvedete C-x C-f in poiete novo datoteko, se vsebina drugega +Seveda ni nujno, da obe okni kažeta isto delovno področje. Če v enem +oknu izvedete C-x C-f in poiščete novo datoteko, se vsebina drugega okna ne spremeni. V vsakem oknu lahko neodvisno obdelujete drugo datoteko. -Pa e ena pot, kako v dveh oknih prikaete dve razlini datoteki: +Pa še ena pot, kako v dveh oknih prikažete dve različni datoteki: ->> Vtipkajte C-x 4 C-f, in na pozivnik vtipkajte ime ene vaih - datotek. Konajte z . Odpre se e eno okno in izbrana - datoteka se pojavi v drugem oknu. Tudi kazalek se preseli v drugo +>> Vtipkajte C-x 4 C-f, in na pozivnik vtipkajte ime ene vaših + datotek. Končajte z . Odpre se še eno okno in izbrana + datoteka se pojavi v drugem oknu. Tudi kazalček se preseli v drugo okno. >> Vtipkajte C-x o, da se vrnete nazaj v zgornje okno, in C-x 1, da zaprete spodnje okno. +* VEČ HKRATNIH OKVIROV +---------------------- + +Emacs lahko ustvari tudi več »okvirov«. Okvir je zbirka oken, skupaj z +menuji, drsniki, pogovornim vmesnikom ipd. V grafičnem načinu je +Emacsov »okvir« tisto, čemur večina drugih programov pravi »okno«. Če +delate v grafičnem načinu, je lahko več okvirov hkrati prikazanih na +zaslonu. V besedilnem terminalu imamo seveda na voljo le en okvir. + +>> Vtipkajte M-x make-frame + Opazite, kako se je na zaslonu pojavil nov okvir. + +Vse, kar ste počeli v prvotnem okviru, lahko počnete tudi v novem. +Prvi okvir ni v ničemer poseben. + +>> Vtipkajte M-x delete-frame + Ukaz izbriše izbrani okvir. + +Okvir lahko izbrišete tudi z običajnim načinom, ki ga ponuja grafični +sistem - pogosto s klikom na simbol »X« v enem od zgornjih kotov okna. +Če zaprete zadnji okvir, s tem obenem zaprete tudi Emacs. + + * REKURZIVNI NIVOJI UREJANJA ---------------------------- -Vasih boste prili v nekaj, emur se pravi ,,rekurzivni nivo -urejanja``. To se vidi po tem, da v statusni vrstici oglati oklepaji -oklepajo ime glavnega naina. V osnovnem nainu bi, na primer, videli +Včasih boste prišli v nekaj, čemur se pravi »rekurzivni nivo +urejanja«. To se vidi po tem, da v statusni vrstici oglati oklepaji +oklepajo ime glavnega načina. V osnovnem načinu bi, na primer, videli [(Fundamental)] namesto (Fundamental). -Iz rekurzivnega nivoja urejanja se reite, e vtipkate ESC ESC ESC. To -zaporedje je vsenamenski ukaz ,,pojdi ven``. Uporabite ga lahko tudi -za ukinjanje odvenih oken, ali vrnitev iz pogovornega vmesnika. +Iz rekurzivnega nivoja urejanja se rešite, če vtipkate ESC ESC ESC. To +zaporedje je vsenamenski ukaz »pojdi ven«. Uporabite ga lahko tudi +za ukinjanje odvečnih oken, ali vrnitev iz pogovornega vmesnika. >> Pritisnite M-x, da odprete pogovorni vmesnik, zatem pa vtipkajte ESC ESC ESC, da pridete ven iz njega. Z ukazom C-g ne morete iz rekurzivnega nivoja urejanja, ker C-g -preklie ukaze ali argumente ZNOTRAJ rekurzivnega nivoja. +prekliče ukaze ali argumente ZNOTRAJ rekurzivnega nivoja. -* DODATNA POMO +* DODATNA POMOČ --------------- -V tem uvodu smo poskuali zbrati dovolj informacij, da lahko zanete -Emacs uporabljati. Emacs ponuja toliko, da bi bilo nemogoe vse to -zbrati tukaj. Verjetno pa bi se vseeno radi nauili kaj o tevilnih -koristnih monostih, ki jih e ne poznate. Emacs ima e vgrajene +V tem uvodu smo poskušali zbrati dovolj informacij, da lahko začnete +Emacs uporabljati. Emacs ponuja toliko, da bi bilo nemogoče vse to +zbrati tukaj. Verjetno pa bi se vseeno radi naučili kaj o številnih +koristnih možnostih, ki jih še ne poznate. Emacs ima že vgrajene veliko dokumentacije, do katere lahko pridete s pritiskom na CONTROL-h -(h kot ,,help``, pomo). +(h kot »help«, pomoč). -Za pomo pritisnete C-h, potem pa vtipkate znak, ki pove, kakno pomo -elite. e ste poplnoma izgubljeni, vtipkajte C-h ? in Emacs vam bo -povedal, kakna pomo je sploh na voljo. e ste vtipkali C-h, pa ste -si premislili, lahko ukaz prekliete s C-g. +Za pomoč pritisnete C-h, potem pa vtipkate znak, ki pove, kakšno pomoč +želite. Če ste poplnoma izgubljeni, vtipkajte C-h ? in Emacs vam bo +povedal, kakšna pomoč je sploh na voljo. Če ste vtipkali C-h, pa ste +si premislili, lahko ukaz prekličete s C-g. -(Na nekaterih sistemih se znak C-h preslika v kaj drugega. To ni -dobro, in v takem primeru se pritoite sistemskemu vzdrevalcu. Medtem -pa, e C-h ne prikae sporoila o pomoi na dnu zaslona, namesto tega -poskusite pritisniti tipko F1 ali pa vtipkajte M-x help .) +(Če C-h ne prikaže sporočila o pomoči na dnu zaslona, poskusite +namesto tega pritisniti tipko F1 ali pa vtipkajte M-x help .) -Najosnovneji tip pomoi prikae C-h c. Pritisnite C-h, tipko c, zatem +Najosnovnejši tip pomoči prikaže C-h c. Pritisnite C-h, tipko c, zatem pa ukazni znak ali zaporedje ukaznih znakov, in Emacs bo izpisal kratek opis ukaza. >> Vtipkajte C-h c C-p. - Izpie se nekaj takega kot + Izpiše se nekaj takega kot C-p runs the command previous-line -Ukaz je izpisal ime funkcije, ki izvede ukaz. Imena funkcij -uporabljamo, kadar piemo prilagoditve in raziritve Emacsa. Ker pa so -navadno imena funkcij izbrana tako, da kaj povedo o tem, kaj funkcija -pone, bo verjetno to tudi dovolj za kratko osveitev, e ste se z -ukazom e kdaj sreali. +Ukaz je izpisal ime funkcije, ki izvede ukaz. Ker so navadno imena +funkcij izbrana tako, da kaj povedo o tem, kaj funkcija počne, bo +verjetno to tudi dovolj za kratko osvežitev, če ste se z ukazom že +kdaj srečali. Ukazu C-h lahko sledi tudi zaporedje znakov, kot na primer C-x C-s, -ali, e nimate tipke META, v. +ali, če nimate tipke META, v. -Za ve informacij o ukazu vtipkajte C-h k namesto C-h c. +Za več informacij o ukazu vtipkajte C-h k namesto C-h c. >> Vtipkajte C-h k C-p. -To odpre novo okno in v njem prikae dokumentacijo o funkciji, obenem +To odpre novo okno in v njem prikaže dokumentacijo o funkciji, obenem z njenim imenom. Ko ste opravili, vtipkajte C-x 1, da se znebite okna -z pomojo. Tega seveda ni potrebno napraviti takoj, ampak lahko -urejate, medtem ko imate odprto okno s pomojo, in ga zaprete, ko ste -konali. +z pomočjo. Tega ni potrebno napraviti ta hip. Namesto tega lahko +urejate, medtem ko imate odprto okno s pomočjo, in ga zaprete, ko ste +končali. -Sledi e nekaj uporabnih monosti, ki jih ponuja pomo: +Sledi še nekaj uporabnih možnosti, ki jih ponuja pomoč: - C-h f Opii funkcijo. Kot argument morate podati ime + C-h f Opiši funkcijo. Kot argument morate podati ime funkcije. ->> Poskusite C-h f previous-line. - To izpie vse podatke, ki jih ima Emacs o funkciji, ki izvede ukaz C-p. +>> Poskusite C-h f previous-line . + To izpiše vse podatke, ki jih ima Emacs o funkciji, ki izvede ukaz C-p. -Podoben ukaz C-h v izpie dokumentacijo za spremenljivke, s katerimi -lahko nastavite obnaanje Emacsa. Ob pozivniku morate vpisati ime -spremenljivke. +Podoben ukaz C-h v izpiše dokumentacijo za spremenljivke, vključno s +tistimi, s katerimi lahko nastavite obnašanje Emacsa. Ob pozivniku +morate vpisati ime spremenljivke. - C-h a Apropos. Vtipkajte kljuno besedo in Emacs bo izpisal - vse ukaze, ki vsebujejo to kljuno besedo. Vse te - ukaze lahko prikliete z META-x. Pri nekaterih ukazih + C-h a Apropos. Vtipkajte ključno besedo in Emacs bo izpisal + vse ukaze, ki vsebujejo to ključno besedo. Vse te + ukaze lahko prikličete z META-x. Pri nekaterih ukazih bo Apropos izpisal tudi eno ali dvoznakovno - zaporedje, s katerim doseete isti uinek. + zaporedje, s katerim dosežete isti učinek. ->> Vtipkajte C-h a file. +>> Vtipkajte C-h a file . To odpre novo okno, v katerem so vsa dolga imena ukazov, ki vsebujejo -,,file`` v imenu. Izvedete jih lahko z M-x. Pri nekaterih se izpie +»file« v imenu. Izvedete jih lahko z M-x. Pri nekaterih se izpiše tudi kratek ukaz, npr. C-x C-f ali C-x C-w pri ukazih find-file in write-file. ->> Pritisnite C-M-v, da se sprehajate po oknu s pomojo. Poskusite +>> Pritisnite C-M-v, da se sprehajate po oknu s pomočjo. Poskusite nekajkrat. ->> Vtipkajte C-x 1, da zaprete okno s pomojo. +>> Vtipkajte C-x 1, da zaprete okno s pomočjo. - C-h i Prironiki z navodili za uporabo (tkim. datoteke - "info"). Ta ukaz vas prestavi v posebno delovno - podroje, imenovano "info". V njem lahko prebirate - prironike za programe, ki so nameeni v sistemu. Z - ukazom m emacs denimo dobite prironik za - urejevalnik Emacs. e sistema Info e niste + C-h i Priročniki z navodili za uporabo (tkim. datoteke + »info«). Ta ukaz vas prestavi v posebno delovno + področje, imenovano »*info*«. V njem lahko prebirate + priročnike za programe, ki so nameščeni v sistemu. Z + ukazom m emacs denimo dobite priročnik za + urejevalnik Emacs. Če sistema Info še niste uporabljali, vtipkajte ? in Emacs vas bo popeljal na - vdeni izlet po nainu Info in monostih, ki jih - ponuja. Ko boste zakljuili z branjem tega prvega - berila, bo prironik za Emacs v sistemu Info va + vódeni izlet po načinu Info in možnostih, ki jih + ponuja. Ko boste zaključili z branjem tega prvega + berila, bo priročnik za Emacs v sistemu Info vaš glavni vir dokumentacije. -* DRUGE MONOSTI +* DRUGE MOŽNOSTI ---------------- -e ve se lahko nauite o Emacsu z branjem prironika, bodisi -natisnjenega, bodisi na zaslonu v sistemu Info (uporabite menu Help -ali vtipkajte F10 h r). Dve monosti, ki vam bosta morda posebej ve, -sta samodejno zakljuevanje vrstice, s katerim prihranite nekaj -tipkanja, in dired, s katerim poenostavimo delo z datotekami. +Še več se lahko naučite o Emacsu z branjem priročnika, bodisi +natisnjenega, bodisi znotraj samega Emacsa (uporabite menu Help ali +vtipkajte C-h r). Dve možnosti, ki vam bosta morda posebej všeč, sta +samodejno zaključevanje vrstice, s katerim prihranite nekaj tipkanja, +in dired, s katerim poenostavimo delo z datotekami. -Samodejno zakljuevanje vrstic je nain, s katerim prihranimo nekaj -tipkanja. e elite denimo preklopiti v delovno podroje *Messages*, +Samodejno zaključevanje vrstic je način, s katerim prihranimo nekaj +tipkanja. Če želite denimo preklopiti v delovno področje *Messages*, je dovolj, da vtipkate C-x b *M in Emacs bo sam dopolnil -preostanek imena delovnega podroja. Samodejno zakljuevanje je -opisano v sistemu Info v prironiku za Emacs, razdelek ,,Completion``. +preostanek imena delovnega področja. Samodejno zaključevanje deluje +tudi za imena ukazov in imena datotek. Samodejno zaključevanje je +opisano v priročniku za Emacs, razdelek »Completion«. -Dired omogoa izpis seznama datotek v imeniku (in po monosti tudi +Dired omogoča izpis seznama datotek v imeniku (in po možnosti tudi podimenikih), premikanje po seznamu, obiskovanje (odpiranje), preimenovanje, brisanje in druge operacije z datotekami. Dired je -opisav v sistemu Info v prironiku za Emacs, razdelek ,,Dired``. +opisav v priročniku za Emacs, razdelek »Dired«. -Prironik opisuje tudi mnoge druge monosti Emacsa. +Priročnik opisuje tudi mnoge druge možnosti Emacsa. -* ZAKLJUEK +* ZAKLJUČEK ----------- -Zapomnite si, da Emacs zapustite z ukazom C-x C-c. e bi radi samo -zaasno skoili v ukazno lupino in se kasneje vrnili v Emacs, pa -storite to z ukazom C-z. +Emacs zapustite z ukazom C-x C-c. -Ta ubenik je napisan z namenom, da bi bil razumljiv vsem novincem v -Emacsu. e se vam kaj ne zdi jasno napisano, ne valite krivde nase - -pritoite se! +Ta učbenik je napisan z namenom, da bi bil razumljiv vsem novincem v +Emacsu. Če se vam kaj ne zdi jasno napisano, ne valite krivde nase - +pritožite se! -* RAZMNOEVANJE IN RAZIRJANJE +* RAZMNOŽEVANJE IN RAZŠIRJANJE ------------------------------ -Angleki izvirnik tega uvoda v Emacs je naslednik dolge vrste tovrstnih -besedil, zaeni s tistim, ki ga je Stuart Cracraft napisal za izvorni -Emacs. V slovenino ga je prevedel Primo Peterlin. +Angleški izvirnik tega uvoda v Emacs je naslednik dolge vrste tovrstnih +besedil, začenši s tistim, ki ga je Stuart Cracraft napisal za izvorni +Emacs. V slovenščino ga je prevedel Primož Peterlin. To besedilo, kot sam GNU Emacs, je avtorsko delo, in njegovo -razmnoevanje in razirjanje je dovoljeno pod naslednjimi pogoji: +razmnoževanje in razširjanje je dovoljeno pod naslednjimi pogoji: + +Copyright © 1985, 1996, 1998, 2001-2012 Free Software Foundation, Inc. -Copyright (C) 1985, 1996, 1998, 2001-2012 Free Software Foundation, Inc. + Ta datoteka je del paketa GNU Emacs. - Dovoljeno je izdelovati in razirjati neokrnjene kopije tega spisa - v kakrnikoli obliki pod pogojem, da je ohranjena navedba o - avtorstvu in to dovoljenje, ter da distributer dovoljuje prejemniku - nadaljnje razirjanje pod pogoji, navedenimi v tem dovoljenju. + GNU Emacs je prost program; lahko ga redistribuirate in/ali prirejate + po pogojih, določenih v dovoljenju za rabo »GNU General Public License«, + izdanem pri Free Software Foundation, bodisi 3. izdaje tega dovoljenja, + bodisi katerekoli kasnejše izdaje, ki je na voljo. - Pod pogoji iz prejnjega odstavka je dovoljeno razirjati - spremenjene verzije tega spisa ali njegovih delov, e je jasno - oznaeno, kdo je nazadnje vnesel spremembe. + GNU Emacs je ponujen v dobri veri, da je uporaben, vendar zanj NI + NOBENEGA JAMSTVA, niti implicitnih jamstev PRIMERNOSTI ZA PRODAJO + ali USTREZNOSTI ZA DOLOČEN NAMEN. Podrobnosti so na voljo v »GNU + General Public License«. -Pogoji za razmnoevanje in razirjanje samega Emacsa so malo drugani, -a v istem duhu. Prosimo, preberite datoteko COPYING in potem dajte -kopijo programa GNU Emacs svojim prijateljem. Pomagajte zatreti -obstrukcionizem (,,lastnitvo``) v programju tako, da uporabljate, -piete in delite prosto programje! + Kopijo »GNU General Public License« bi morali prejeti skupaj s paketom + GNU Emacs. Če je niste, je na voljo na . + +Prosimo, preberite datoteko COPYING in potem ponudite kopijo programa +GNU Emacs svojim prijateljem. Pomagajte zatreti obstrukcionizem +(»lastništvo«) v programju tako, da uporabljate, pišete in delite +prosto programje! ;;; Local Variables: -;;; coding: iso-latin-2 +;;; coding: utf-8 ;;; sentence-end-double-space: nil ;;; End: - diff --git a/etc/tutorials/TUTORIAL.translators b/etc/tutorials/TUTORIAL.translators index 64780687bb1..3408ef79fd3 100644 --- a/etc/tutorials/TUTORIAL.translators +++ b/etc/tutorials/TUTORIAL.translators @@ -75,8 +75,8 @@ Author: Miroslav Vaško Maintainer: Maintainer needed. * TUTORIAL.sl: -Author: Primož Peterlin -Maintainer: Primož Peterlin +Author: Primož Peterlin +Maintainer: Primož Peterlin * TUTORIAL.sv: Author: Mats Lidell -- cgit v1.2.1 From 8c82b1b4dcca42c29992a71b3f1c9d3803d74d3a Mon Sep 17 00:00:00 2001 From: Alan Mackenzie Date: Tue, 17 Jan 2012 18:46:02 +0000 Subject: Update the ChangeLog. --- lisp/ChangeLog | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index fa51e7eb28f..f9628202001 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -40,6 +40,17 @@ * dired.el (dired-get-filename): Fix 'verbatim case of previous change. +2012-01-13 Alan Mackenzie + + Fix filling for when filladapt mode is enabled. + + * progmodes/cc-cmds.el (c-fill-paragraph): In the invocation of + c-mask-paragraph, pass in `fill-paragraph' rather than + `fill-region-as-paragraph'. (This is a reversion of a previous + change.) + * progmodes/cc-mode.el (c-basic-common-init): Make + fill-paragraph-handle-comment buffer local and set it to nil. + 2012-01-13 Glenn Morris * dired.el (dired-switches-escape-p): New function. -- cgit v1.2.1 From 1db03b16182e5661068c21a8828b03ac79b243a2 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Tue, 17 Jan 2012 17:27:46 -0500 Subject: Dired fixes for newlines in directory names. * lisp/dired.el (dired-insert-directory): Handle newlines in directory name. (dired-build-subdir-alist): Unescape newlines in directory name. --- lisp/ChangeLog | 5 +++++ lisp/dired.el | 45 +++++++++++++++++++++++++++++++++++++++------ 2 files changed, 44 insertions(+), 6 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index f9628202001..0ef61f48679 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2012-01-17 Glenn Morris + + * dired.el (dired-insert-directory): Handle newlines in directory name. + (dired-build-subdir-alist): Unescape newlines in directory name. + 2012-01-17 Michael Albinus * net/tramp.el (tramp-local-end-of-line): New defcustom. diff --git a/lisp/dired.el b/lisp/dired.el index f1a778ad05a..34fb651db10 100644 --- a/lisp/dired.el +++ b/lisp/dired.el @@ -1172,7 +1172,22 @@ see `dired-use-ls-dired' for more details.") "\\015" (text-properties-at (match-beginning 0))) nil t)) - (set-marker end nil))) + (set-marker end nil)) + ;; Replace any newlines in DIR with literal "\n"s, for the sake + ;; of the header line. To disambiguate a literal "\n" in the + ;; actual dirname, we also replace "\" with "\\". + ;; Personally, I think this should always be done, irrespective + ;; of the value of dired-actual-switches, because: + ;; i) Dired simply does not work with an unescaped newline in + ;; the directory name used in the header (bug=10469#28), and + ;; ii) "\" is always replaced with "\\" in the listing, so doing + ;; it in the header as well makes things consistent. + ;; But at present it is only done if "-b" is in ls-switches, + ;; because newlines in dirnames are uncommon, and people may + ;; have gotten used to seeing unescaped "\" in the headers. + ;; Note: adjust dired-build-subdir-alist if you change this. + (setq dir (replace-regexp-in-string "\\\\" "\\\\" dir nil t) + dir (replace-regexp-in-string "\n" "\\n" dir nil t))) (dired-insert-set-properties opoint (point)) ;; If we used --dired and it worked, the lines are already indented. ;; Otherwise, indent them. @@ -2541,12 +2556,30 @@ instead of `dired-actual-switches'." (delete-region (point) (match-end 1)) (insert new-dir-name)) (setq count (1+ count)) + ;; Undo any escaping of newlines and \ by dired-insert-directory. + ;; Convert "n" preceded by odd number of \ to newline, and \\ to \. + (when (dired-switches-escape-p switches) + (let (temp res) + (mapc (lambda (char) + (cond ((equal char ?\\) + (if temp + (setq res (concat res "\\") + temp nil) + (setq temp "\\"))) + ((and temp (equal char ?n)) + (setq res (concat res "\n") + temp nil)) + (t + (setq res (concat res temp (char-to-string char)) + temp nil)))) + new-dir-name) + (setq new-dir-name res))) (dired-alist-add-1 new-dir-name - ;; Place a sub directory boundary between lines. - (save-excursion - (goto-char (match-beginning 0)) - (beginning-of-line) - (point-marker))))) + ;; Place a sub directory boundary between lines. + (save-excursion + (goto-char (match-beginning 0)) + (beginning-of-line) + (point-marker))))) (if (and (> count 1) (called-interactively-p 'interactive)) (message "Buffer includes %d directories" count))) ;; We don't need to sort it because it is in buffer order per -- cgit v1.2.1 From 7b4b130107cfe8ea3b924b2228f326ef9cb07ee6 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Tue, 17 Jan 2012 17:31:07 -0500 Subject: * doc/lispintro/emacs-lisp-intro.texi (re-search-forward): Fix typo. --- doc/lispintro/ChangeLog | 4 ++++ doc/lispintro/emacs-lisp-intro.texi | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/doc/lispintro/ChangeLog b/doc/lispintro/ChangeLog index 0365a3ca174..30ea2be6803 100644 --- a/doc/lispintro/ChangeLog +++ b/doc/lispintro/ChangeLog @@ -1,3 +1,7 @@ +2012-01-17 Glenn Morris + + * emacs-lisp-intro.texi (re-search-forward): Fix typo. + 2011-11-24 Juanma Barranquero * makefile.w32-in: Update dependencies. diff --git a/doc/lispintro/emacs-lisp-intro.texi b/doc/lispintro/emacs-lisp-intro.texi index 0f9b6b906aa..be49c52ac2c 100644 --- a/doc/lispintro/emacs-lisp-intro.texi +++ b/doc/lispintro/emacs-lisp-intro.texi @@ -12607,7 +12607,7 @@ four arguments: @enumerate @item The first argument is the regular expression that the function searches -for. The regular expression will be a string between quotations marks. +for. The regular expression will be a string between quotation marks. @item The optional second argument limits how far the function will search; it is a -- cgit v1.2.1 From 0e6038be96b1641a32620b0f29a5a898a1c4cb31 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Tue, 17 Jan 2012 17:33:05 -0500 Subject: * lisp/isearch.el (search-nonincremental-instead): Fix doc typo. --- lisp/ChangeLog | 2 ++ lisp/isearch.el | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 0ef61f48679..efb428313e2 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,7 @@ 2012-01-17 Glenn Morris + * isearch.el (search-nonincremental-instead): Fix doc typo. + * dired.el (dired-insert-directory): Handle newlines in directory name. (dired-build-subdir-alist): Unescape newlines in directory name. diff --git a/lisp/isearch.el b/lisp/isearch.el index a6cc69be9a6..ce759116860 100644 --- a/lisp/isearch.el +++ b/lisp/isearch.el @@ -102,7 +102,7 @@ in Isearch mode is always downcased." :group 'isearch) (defcustom search-nonincremental-instead t - "If non-nil, do a nonincremental search instead if exiting immediately. + "If non-nil, do a nonincremental search instead of exiting immediately. Actually, `isearch-edit-string' is called to let you enter the search string, and RET terminates editing and does a nonincremental search." :type 'boolean -- cgit v1.2.1 From 01153e4496db5be3e9041245ca8a5483bf0b328c Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Tue, 17 Jan 2012 19:08:05 -0500 Subject: * lisp/dired.el (dired-build-subdir-alist): Restrict previous change. (to only file names containing "\"s) --- lisp/dired.el | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lisp/dired.el b/lisp/dired.el index 34fb651db10..733e522a9aa 100644 --- a/lisp/dired.el +++ b/lisp/dired.el @@ -2558,7 +2558,8 @@ instead of `dired-actual-switches'." (setq count (1+ count)) ;; Undo any escaping of newlines and \ by dired-insert-directory. ;; Convert "n" preceded by odd number of \ to newline, and \\ to \. - (when (dired-switches-escape-p switches) + (when (and (dired-switches-escape-p switches) + (string-match "\\\\" new-dir-name)) (let (temp res) (mapc (lambda (char) (cond ((equal char ?\\) -- cgit v1.2.1 From 9ff5d5a5d1c6a9449558bc5625ae2d3a287860c4 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Tue, 17 Jan 2012 19:10:56 -0500 Subject: * dired.el (dired-build-subdir-alist): Use string-match-p in previous change. --- lisp/dired.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/dired.el b/lisp/dired.el index 733e522a9aa..57f67ca7c8c 100644 --- a/lisp/dired.el +++ b/lisp/dired.el @@ -2559,7 +2559,7 @@ instead of `dired-actual-switches'." ;; Undo any escaping of newlines and \ by dired-insert-directory. ;; Convert "n" preceded by odd number of \ to newline, and \\ to \. (when (and (dired-switches-escape-p switches) - (string-match "\\\\" new-dir-name)) + (string-match-p "\\\\" new-dir-name)) (let (temp res) (mapc (lambda (char) (cond ((equal char ?\\) -- cgit v1.2.1 From 71784361eb381ec2b12bd8283724a7addec49079 Mon Sep 17 00:00:00 2001 From: Kenichi Handa Date: Wed, 18 Jan 2012 10:11:15 +0900 Subject: international/mule-cmds.el (prefer-coding-system): Show a warning message if the default value of file-name-coding-system was not changed. --- lisp/ChangeLog | 6 ++++++ lisp/international/mule-cmds.el | 5 ++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 37286d0780c..f900c7dfa50 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2011-12-30 Kenichi Handa + + * international/mule-cmds.el (prefer-coding-system): Show a + warning message if the default value of file-name-coding-system + was not changed. + 2011-12-29 Michael Albinus * net/tramp-sh.el (tramp-find-shell): Set "remote-shell" property diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el index 0d3f079866e..94b5724c016 100644 --- a/lisp/international/mule-cmds.el +++ b/lisp/international/mule-cmds.el @@ -418,7 +418,10 @@ To prefer, for instance, utf-8, say the following: (if (memq eol-type '(0 1 2)) (setq base (coding-system-change-eol-conversion base eol-type))) - (set-default-coding-systems base))) + (set-default-coding-systems base) + (if (called-interactively-p 'interactive) + (or (eq base default-file-name-coding-system) + (message "The default value of `file-name-coding-system' was not changed because the specified coding system is not suitable for file names."))))) (defvar sort-coding-systems-predicate nil "If non-nil, a predicate function to sort coding systems. -- cgit v1.2.1 From f3860cea15990321965ecba3961c9f5d5700556f Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Tue, 17 Jan 2012 20:33:19 -0500 Subject: files.el doc fixes. * lisp/files.el (auto-mode-alist, inhibit-first-line-modes-regexps) (set-auto-mode): Doc fixes. --- lisp/ChangeLog | 5 +++++ lisp/files.el | 9 ++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index efb428313e2..6ada090d071 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2012-01-18 Glenn Morris + + * files.el (auto-mode-alist, inhibit-first-line-modes-regexps) + (set-auto-mode): Doc fixes. + 2012-01-17 Glenn Morris * isearch.el (search-nonincremental-instead): Fix doc typo. diff --git a/lisp/files.el b/lisp/files.el index f15c523400d..6056a70d4a1 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -2405,9 +2405,6 @@ If the element has the form (REGEXP FUNCTION NON-NIL), then after calling FUNCTION (if it's not nil), we delete the suffix that matched REGEXP and search the list again for another match. -If the file name matches `inhibit-first-line-modes-regexps', -then `auto-mode-alist' is not processed. - The extensions whose FUNCTION is `archive-mode' should also appear in `auto-coding-alist' with `no-conversion' coding system. @@ -2481,7 +2478,8 @@ See also `auto-mode-alist'.") (defvar inhibit-first-line-modes-regexps (mapcar 'purecopy '("\\.tar\\'" "\\.tgz\\'" "\\.tiff?\\'" "\\.gif\\'" "\\.png\\'" "\\.jpe?g\\'")) - "List of regexps; if one matches a file name, don't look for `-*-'.") + "List of regexps; if one matches a file name, don't look for `-*-'. +See also `inhibit-first-line-modes-suffixes'.") (defvar inhibit-first-line-modes-suffixes nil "List of regexps for what to ignore, for `inhibit-first-line-modes-regexps'. @@ -2550,7 +2548,8 @@ Also applies to `magic-fallback-mode-alist'.") (defun set-auto-mode (&optional keep-mode-if-same) "Select major mode appropriate for current buffer. -To find the right major mode, this function checks for a -*- mode tag, +To find the right major mode, this function checks for a -*- mode tag +\(unless `inhibit-first-line-modes-regexps' says not to), checks for a `mode:' entry in the Local Variables section of the file, checks if it uses an interpreter listed in `interpreter-mode-alist', matches the buffer beginning against `magic-mode-alist', -- cgit v1.2.1 From 0a1cb9ede18ed66a5c1792ed2de09946ba7e61de Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Tue, 17 Jan 2012 19:38:59 -0800 Subject: * etc/TODO: Add entry for writing tests. --- etc/TODO | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/etc/TODO b/etc/TODO index 411581673e3..db1d50192f2 100644 --- a/etc/TODO +++ b/etc/TODO @@ -71,6 +71,12 @@ things in their .emacs. ** See if other files can use generated-autoload-file (see eg ps-print). +** Write more tests. Pick a fixed bug from the database, write a test +case to make sure it stays fixed. Or pick your favorite programming +major-mode, and write a test for its indentation. Or a version +control backend, and write a test for its status parser. Etc. +See test/automated for examples. + * Small but important fixes needed in existing features: ** Flymake's customization mechanism needs to be both simpler (fewer -- cgit v1.2.1 From 3fcca64dce0c0e9f6c6fc55f19ce47fe9e861352 Mon Sep 17 00:00:00 2001 From: Werner LEMBERG Date: Wed, 18 Jan 2012 11:33:30 +0100 Subject: * tutorial/TUTORIAL.de: Updated; synchronize with TUTORIAL. Minor typographical improvements. --- etc/ChangeLog | 5 + etc/tutorials/TUTORIAL.de | 746 ++++++++++++++++++++++------------------------ 2 files changed, 362 insertions(+), 389 deletions(-) diff --git a/etc/ChangeLog b/etc/ChangeLog index b13b858ca4e..c6ba86a029a 100644 --- a/etc/ChangeLog +++ b/etc/ChangeLog @@ -1,3 +1,8 @@ +2012-01-19 Werner Lemberg + + * tutorial/TUTORIAL.de: Updated; synchronize with TUTORIAL. + Minor typographical improvements. + 2012-01-17 Primoz PETERLIN * tutorials/TUTORIAL.sl: Update. diff --git a/etc/tutorials/TUTORIAL.de b/etc/tutorials/TUTORIAL.de index 2908203b391..3e6927441c8 100644 --- a/etc/tutorials/TUTORIAL.de +++ b/etc/tutorials/TUTORIAL.de @@ -15,7 +15,7 @@ EDIT oder ALT genannt). Folgende Abk M-f Halten Sie die META-Taste gedrckt und geben Sie den Buchstaben (klein) f ein. -`>>' am linken Rand ist ein Hinweis, einen Befehl auszuprobieren: +>> am linken Rand ist ein Hinweis, einen Befehl auszuprobieren: <> [Leerzeilen befinden sich hier aus didaktischen Grnden. Fortsetzung unten.] >> Drcken Sie C-v, um zur nchsten Bildschirmseite vorzublttern. @@ -32,7 +32,7 @@ Wichtig: Sie k Im weiteren wird die ESC-Taste mit bezeichnet. [Falls die deutschen Umlaute nicht korrekt auf dem Bildschirm -erscheinen, lesen Sie bitte den Abschnitt `MULE' kurz vor Ende dieser +erscheinen, lesen Sie bitte den Abschnitt MULE kurz vor Ende dieser Einfhrung.] Zunchst mssen Sie wissen, wie man sich innerhalb eines Dokuments @@ -43,9 +43,9 @@ Sie zuerst und anschlie >> Probieren Sie einige Male M-v und C-v aus. -[Auf den meisten Tastaturen bewirkt die PgUp-Taste (`page up', auch -mit `Bild' und einem Aufwrtspfeil beschriftet) dasselbe wie M-v bzw. -die PgDn-Taste (`page down', `Bild' mit Abwrtspfeil) dasselbe wie +[Auf den meisten Tastaturen bewirkt die PgUp-Taste (page up, auch +mit Bild und einem Aufwrtspfeil beschriftet) dasselbe wie M-v bzw. +die PgDn-Taste (page down, Bild mit Abwrtspfeil) dasselbe wie C-v.] @@ -60,13 +60,14 @@ betrachten: C-l lsche den Bildschirm und stelle den ganzen Text erneut dar, wobei der Text rund um den Cursor zur Mitte des Bildschirms bewegt wird. - (`l' ist der Buchstabe `klein L', nicht die Ziffer 1.) + (l ist der Buchstabe klein L, nicht die Ziffer 1.) ->> Lokalisieren Sie den Cursor und merken sich den Text in dessen - Umgebung. Drcken Sie C-l. Der Cursor ist jetzt ungefhr in der - (vertikalen) Bildschirmmitte, und er hat seine Position relativ zum - Text nicht gendert. +>> Finden Sie den Cursor und merken sich den Text in dessen Umgebung. + Drcken Sie C-l. Der Cursor ist jetzt ungefhr in der (vertikalen) + Bildschirmmitte, und er hat seine Position relativ zum Text nicht + gendert. Wiederholtes Drcken von C-l bewegt den Text zum oberen + Bildschirmrand, dann zum unteren, und dann wieder zur Mitte. * KONTROLLE DES CURSORS @@ -91,7 +92,7 @@ Befehl den Cursor wohin bewegt: [Die Buchstaben p, b, f und n stehen fr die englischen Wrter -`previous', `backward', `forward' und `next'.] +previous, backward, forward und next.] >> Bewegen Sie den Cursor zur Zeile in der Mitte des Diagramms mittels C-n oder C-p. Geben Sie dann C-l ein, und das ganze Diagramm ist @@ -113,8 +114,10 @@ unterst Beobachten Sie, was C-p tut, wenn der Cursor sich in der Zeilenmitte befindet. -Jede Textzeile endet mit einem Zeilenvorschub-Zeichen (`newline'), das -sie von der folgenden Zeile trennt. +Jede Textzeile endet mit einem Zeilenvorschub-Zeichen (newline), das +sie von der folgenden Zeile trennt. Die letzte Zeile in einer Datei +hat normalerweise ebenfalls einen Zeilenvorschub am Schluss, Emacs +bentigt ihn aber nicht. >> Probieren Sie C-b am Anfang einer Zeile. Der Cursor sollte zum Ende der vorigen Zeile springen: C-b berspringt @@ -132,7 +135,7 @@ C-f Wenn Sie den Cursor entweder nach oben oder nach unten ber den Bildschirmrand hinaus bewegen wollen, dann wird statt dessen Text in -den Bildschirm hineingeschoben. Dies nennt man `scrolling'. Auf +den Bildschirm hineingeschoben. Dies nennt man scrolling. Auf diese Weise verhindert Emacs, dass der Cursor je den sichtbaren Bereich verlsst. @@ -155,7 +158,7 @@ analog, aber in die entgegengesetzte Richtung. zwischen Wrtern zu beobachten. Beachten Sie die Parallele zwischen C-f und C-b einerseits und M-f und -M-b andererseits. Sehr oft werden mit `META-' beginnende Befehle fr +M-b andererseits. Sehr oft werden mit META- beginnende Befehle fr Operationen verwendet, die mit Sprache zu tun haben (Wrter, Stze, Abstze), whrend CONTROL-Befehle mit den Text-Basiseinheiten operieren, unabhngig davon, was Sie gerade editieren (Zeichen, @@ -181,26 +184,26 @@ lassen. Dadurch erm Abkrzungspunkten und dem Satzende unterscheiden kann, was fr Textsuche in wissenschaftlichen Texten oft vorteilhaft ist.] -[Anmerkung 2: Die Tasten `Home' (Pos1) und `End' (Ende) verhalten sich +[Anmerkung 2: Die Tasten Home (Pos1) und End (Ende) verhalten sich standardmig wie C-a und C-e, wie wohl die meisten Benutzer annehmen.] -Die aktuelle Position des Cursors wird im Englischen auch `point' -(Punkt) genannt. Beachten Sie bitte, dass sich `point' stets +Die aktuelle Position des Cursors wird im Englischen auch point +(Punkt) genannt. Beachten Sie bitte, dass sich point stets *zwischen* zwei Zeichen befindet, nmlich genau vor dem Cursor-Kstchen. Hier ist eine Zusammenfassung von einfachen Bewegungsbefehlen fr den Cursor einschlielich der Wort- und Satzbewegungsbefehle: - C-f ein Zeichen vorwrts (auch `Pfeil rechts'-Taste) - C-b ein Zeichen zurck (auch `Pfeil links'-Taste) + C-f ein Zeichen vorwrts (auch Pfeil rechts-Taste) + C-b ein Zeichen zurck (auch Pfeil links-Taste) M-f ein Wort vorwrts M-b ein Wort zurck - C-n eine Zeile vorwrts (auch `Pfeil hinunter'-Taste) - C-p eine Zeile zurck (auch `Pfeil hinauf'-Taste) + C-n eine Zeile vorwrts (auch Pfeil hinunter-Taste) + C-p eine Zeile zurck (auch Pfeil hinauf-Taste) C-a zum Zeilenanfang C-e zum Zeilenende @@ -215,7 +218,7 @@ Zwei weitere wichtige Befehle f Kleiner-als) und M-> (META Grer-als), welche zum Anfang bzw. zum Ende des ganzen Textes springen. -Bei den meisten Terminal-Tastaturen befindet sich `<' ber dem Komma, +Bei den meisten Terminal-Tastaturen befindet sich < ber dem Komma, d.h., Sie mssen zustzlich die SHIFT-Taste verwenden (der Umschalter ist auf deutschen Tastaturen normalerweise mit einem dicken Aufwrtspfeil markiert). Ohne SHIFT-Taste wrden Sie M-Komma @@ -224,17 +227,17 @@ eingeben. >> Testen Sie nun M-<, um an den Anfang der Einfhrung zu gelangen. Verwenden Sie dann C-v, um wieder hierher zu kommen. -[Anmerkung: Die Tastenkombinationen `C-Home' (Pos1) und `C-End' (Ende) +[Anmerkung: Die Tastenkombinationen C-Home (Pos1) und C-End (Ende) verhalten sich standardmig wie M-< und M->.] Ein weiteres, oft bentztes Konzept in Emacs ist die Markierung -(`mark'). Der Grundbefehl dazu ist C-SPC (oder gleichwertig C-@, -`SPC' bezeichnet die Leertaste, engl. `space key'); mit ihm kann eine +(mark). Der Grundbefehl dazu ist C-SPC (oder gleichwertig C-@, +SPC bezeichnet die Leertaste, engl. space key); mit ihm kann eine Markierung gesetzt werden. Mit C-u C-SPC kommt man zu dieser Markierung zurck, falls man den Cursor inzwischen weiterbewegt hat. Viele Befehle, die groe Sprnge in einem Text ausfhren (so auch M-> und M-<) setzen eine Markierung implizit, was in der untersten Zeile -(dem Echobereich, s.u.) als `Mark set' angezeigt wird. +(dem Echobereich, s.u.) als Mark set angezeigt wird. >> Verwenden Sie jetzt M->, um zum Ende der Einfhrung zu springen und bentzen Sie C-u C-SPC, um hierher zurckzukehren. @@ -257,7 +260,7 @@ Ziffern und dann der Befehl selbst. Alternativ k META-Taste (bzw. EDIT- oder ALT-Taste) gedrckt halten und dann die Ziffern des Wiederholungszhlers eingeben. Wir empfehlen allerdings, die C-u-Methode zu lernen, da sie mit jedem Terminal funktioniert. -Das numerische Argument wird auch `Prfix-Argument' genannt, da man es +Das numerische Argument wird auch Prfix-Argument genannt, da man es vor dem zugehrigen Befehl eingibt. Beispiel: C-u 8 C-f bewegt den Cursor acht Zeichen vorwrts. @@ -268,7 +271,7 @@ Beispiel: C-u 8 C-f bewegt den Cursor acht Zeichen vorw Wie gesagt, die meisten Befehle verwenden das numerische Argument als Wiederholungszhler, jedoch nicht alle. Einige davon, die allerdings -noch nicht besprochen wurden, bentzen es als Flag (`Flagge'), d.h., +noch nicht besprochen wurden, bentzen es als Flag (Flagge), d.h., allein das Vorhandensein eines Prfix-Arguments, unabhngig von seinem Wert, signalisiert dem Befehl, etwas anderes zu tun. @@ -283,27 +286,20 @@ Der Bildschirminhalt sollte jetzt um acht Zeilen nach oben verschoben sein. Wollen Sie ihn nach unten verschieben, dann geben Sie M-v mit einem numerischen Argument ein. -Wenn Sie eine graphische Oberflche wie X11 oder MS-Windows verwenden, -dann befindet sich ein schmaler, langgezogener rechteckiger Bereich auf -der linken oder rechten Seite des Emacs-Fensters. Dieser Bereich -wird Scrollbar genannt (`Verschiebungsbalken'). Sie knnen Text +Wenn Sie eine graphische Oberflche wie X oder MS-Windows verwenden, +dann befindet sich ein schmaler, langgezogener rechteckiger Bereich +auf der linken oder rechten Seite des Emacs-Fensters. Dieser Bereich +wird Scrollbar genannt (Verschiebungsbalken). Sie knnen Text verschieben, indem Sie mit der Maus auf den Scrollbar klicken. ->> Drcken Sie die mittlere Taste (oder die linke und rechte Taste - gleichzeitig, falls Sie eine Zwei-Tasten-Maus verwenden) innerhalb - des Scrollbar-Bereichs. Das sollte den Text zu einer Position - verschieben, die davon abhngt, wie weit oben oder unten Sie - geklickt haben. - ->> Bewegen Sie nun die Maus auf und ab, whrend Sie die mittlere Taste - gedrckt halten. Sie werden sehen, dass der Text entsprechend der - Mausbewegungen nach oben oder unter verschoben wird. +Hat Ihre Maus ein Mausrad, knnen Sie damit ebenfalls Text +verschieben. * WENN EMACS NICHT MEHR REAGIERT -------------------------------- -Wenn Emacs `hngt', also auf keine Ihrer Eingaben reagiert, drcken +Wenn Emacs hngt, also auf keine Ihrer Eingaben reagiert, drcken Sie C-g. Sie knnen C-g auch dazu bentzen, einen Befehl zu stoppen, der zu lange braucht. @@ -323,13 +319,13 @@ mit C-g r * DEAKTIVIERTE BEFEHLE ---------------------- -Ein paar Befehle von Emacs sind deaktiviert (`disabled'), damit +Ein paar Befehle von Emacs sind deaktiviert (disabled), damit Anfnger sie nicht unabsichtlich benutzen. Wenn Sie einen solchen Befehl eingeben, dann gibt Emacs eine Meldung aus und fragt Sie, ob Sie ihn wirklich ausfhren wollen. -Antworten Sie mit y (fr `yes') oder drcken Sie die Leertaste, wenn +Antworten Sie mit y (fr yes) oder drcken Sie die Leertaste, wenn Sie den Befehl ausfhren wollen, sonst mit n. >> Geben Sie C-x C-l ein (das ist ein deaktivierter Befehl) und @@ -339,7 +335,7 @@ Sie den Befehl ausf * FENSTER --------- -Emacs kann mehrere Fenster (`windows') haben, von denen jedes seinen +Emacs kann mehrere Fenster (windows) haben, von denen jedes seinen eigenen Text darstellt. Spter erklren wir, wie man mit Fenstern umgeht. Hier wollen wir nur erklren, wie man ein (vielleicht irrtmlich erzeugtes) Fenster wieder entfernt und zum normalen @@ -351,14 +347,14 @@ Das ist C-x gefolgt von der Ziffer 1. C-x 1 expandiert das Fenster, in dem der Cursor sich befindet, sodass es den ganzen Bildschirm erfasst. Alle anderen Fenster werden gelscht. -[Anmerkung: Emacs verwendet das Wort Fenster (`windows') in einem +[Anmerkung: Emacs verwendet das Wort Fenster (windows) in einem anderen Sinn, als Sie es vielleicht gewhnt sind. Wenn Sie einen Textbildschirm vor sich haben, dann ist die Terminologie eindeutig. Wenn Sie allerdings eine graphische Oberflche benutzen, dann bezeichnet ein Emacs-Fenster einen Teilbereich des Fensters (von Ihrer graphischen Oberflche erzeugt), in dem Emacs luft, in vlliger Analogie zum Textmodus. Fr (graphische) Fenster im herkmmlichen -Sinn verwenden die Emacs-Entwickler den Ausdruck Rahmen (`frame').] +Sinn verwenden die Emacs-Entwickler den Ausdruck Rahmen (frame).] >> Bewegen Sie den Cursor zu dieser Zeile und geben Sie C-u 0 C-l ein. @@ -376,38 +372,32 @@ Sinn verwenden die Emacs-Entwickler den Ausdruck Rahmen (`frame').] Wenn Sie Text einfgen wollen, dann geben Sie ihn einfach ein. Sichtbare Zeichen, z.B. A, 7, * usw. werden als Text von Emacs sofort eingefgt. Drcken Sie (die Zeilenvorschubtaste, meistens -mit `Enter' oder nur mit einem Rckwrts-Hakenpfeil beschriftet), um +mit Enter oder nur mit einem Rckwrts-Hakenpfeil beschriftet), um ein Zeilenvorschubzeichen einzufgen. -Sie knnen das zuletzt eingegebene Zeichen lschen, indem Sie -drcken. ist einer Taste auf der Tastatur zugeordnet, die -mit `Del' oder `Entf' beschriftet ist. In manchen Fllen dient die -Backspace-Taste (oft auch nur als Rckwrtspfeil beschriftet) als -, aber nicht immer! +Sie knnen das zuletzt eingegebene Zeichen lschen, indem Sie +drcken. ist der Backspace-Taste zugeordnet (oft auch nur als +Rckwrtspfeil beschriftet). -Allgemein gesprochen lscht das Zeichen unmittelbar vor der +Allgemein gesprochen lscht das Zeichen unmittelbar vor der aktuellen Cursorposition. -[Beachten Sie, dass ein logischer Befehlsname ist, der auf -die jeweilige Tastatur abgebildet wird. Lesen Sie im Abschnitt `Init -Rebinding' des Emacs-Handbuches nach, wie Sie gegebenenfalls die -Tastaturbelegung verndern knnen.] - >> Probieren Sie das jetzt aus: Geben Sie ein paar Zeichen ein und - lschen Sie sie wieder mit . Sie brauchen sich keine - Sorgen zu machen, dieses Dokument zu verndern: Was Sie hier lesen, - ist nur eine (persnliche) Kopie des originalen Dokuments. + lschen Sie sie wieder mit . Sie brauchen sich keine Sorgen + zu machen, dieses Dokument zu verndern: Was Sie hier lesen, ist + nur eine (persnliche) Kopie des originalen Dokuments. -Wenn eine Textzeile zu lang wird fr eine Bildschirmzeile, dann wird -sie auf einer zweiten Bildschirmzeile `fortgesetzt'. Ein -`Backslash'-Zeichen (`\') bzw. ein kleiner gebogener Pfeil (bei -graphischen Oberflchen) am rechten Rand verdeutlicht das. +Wenn eine Textzeile zu lang fr eine Bildschirmzeile ist, wird sie auf +einer zweiten Bildschirmzeile fortgesetzt: Bei graphischen +Oberflchen erscheinen zwei kleine gebogene Pfeile links und rechts +vom Textbereich (diese schmalen Spalten werden fringe genannt), bei +Terminals ein Backslash-Zeichen (\) am rechten Rand. >> Fgen Sie Text ein, bis Sie den rechten Rand erreicht haben. Fgen Sie weiter Text ein. Beobachten Sie, wie eine Fortsetzungszeile erscheint. ->> Verwenden Sie so oft, bis die Textzeile wieder auf eine +>> Verwenden Sie so oft, bis die Textzeile wieder auf eine Bildschirmzeile passt. Die Fortsetzungszeile verschwindet wieder. Sie knnen das Zeilenvorschubzeichen wie jedes andere Zeichen lschen: @@ -415,7 +405,7 @@ Die Zeilen vor und nach ihm werden dann zu einer zusammengeh diese lnger als die Bildschirmbreite, erscheint eine Fortsetzungszeile. ->> Bewegen Sie den Cursor zum Anfang der Zeile und geben Sie +>> Bewegen Sie den Cursor zum Anfang der Zeile und geben Sie ein: Die momentane Zeile wird an die vorige angehngt. >> Geben Sie ein, um wieder ein Zeilenvorschubzeichen @@ -432,10 +422,10 @@ Bis jetzt kennen Sie die Grundbefehle, um Text in Emacs einzugeben und Fehler zu korrigieren -- fast analog zu den Bewegungsbefehlen ist es mglich, ganze Wrter, Stze oder Zeilen zu lschen: - lsche ein Zeichen vor dem Cursor + lsche ein Zeichen vor dem Cursor C-d lsche das Zeichen unter dem Cursor - M- lsche bis zum (nchsten) Wortanfang unmittelbar + M- lsche bis zum (nchsten) Wortanfang unmittelbar vor dem Cursor M-d lsche bis zum (nchsten) Wortende nach (bzw. unter) dem Cursor @@ -445,42 +435,40 @@ m M-k lsche bis zum nchsten Satzende nach (bzw. unter) dem Cursor -Beachten Sie bitte, dass je nach Tastaturbelegung die Del- -(Entf-) oder die Backspace- (Rckwrtspfeil-) Taste sein kann. - Eine andere, einheitliche Methode zum Lschen von Text ist das Befehlspaar C-@ (oder C-SPC) und C-w. Gehen sie zum Anfang des zu lschenden Textes und drcken Sie C-@ oder C-SPC. Gehen Sie dann zum Ende des zu lschenden Textes und drcken Sie C-w, um ihn zu entfernen. ->> Bewegen Sie den Cursor zum Buchstaben `E' am Anfang des letzten +>> Bewegen Sie den Cursor zum Buchstaben E am Anfang des letzten Absatzes. ->> Drcken Sie C-SPC. Emacs sollte die Meldung `Mark set' am unteren +>> Drcken Sie C-SPC. Emacs sollte die Meldung Mark set am unteren Bildschirmrand zeigen. ->> Bewegen Sie den Cursor zum Buchstaben `A' in der zweiten Zeile des +>> Bewegen Sie den Cursor zum Buchstaben A in der zweiten Zeile des letzten Absatzes. ->> Geben Sie C-w ein. Der ganze Text, beginnend mit dem `E' und - endend vor dem `A', ist nun gelscht. +>> Geben Sie C-w ein. Der ganze Text, beginnend mit dem E und + endend vor dem A, ist nun gelscht. Lschen Sie mehr als ein Zeichen auf einmal, speichert Emacs den gelschten Text, damit Sie ihn bei Bedarf wieder zurckholen knnen. Einfgen von bereits gelschtem Text wird im englischen Dokumentation -von Emacs als `yanking' (wrtlich `herausreien') bezeichnet. Sie +von Emacs als yanking (wrtlich herausreien) bezeichnet. Sie knnen den gelschten Text an einer beliebigen Stelle wieder einzufgen. Solange Sie nichts neues lschen, steht Ihnen dieser gelschte Textteil immer wieder zu Verfgung. Der Befehl dazu ist C-y -(das Ypsilon steht fr `yank'). +(das Ypsilon steht fr yank). Emacs unterscheidet zwei Klassen von Lschbefehlen (was man im -Deutschen leider nicht gut wiedergeben kann): `killing' (umbringen) -und `deleting' (lschen). Wenn man sich vorstellt, dass `yanking' den -Begriff `von den Toten erwecken' darstellt, dann hat man ungefhr eine -Vorstellung von der Metapher -- Von einem `kill'-Befehl gelschter -Text wird gespeichert und kann bei Bedarf mit C-y zurckgeholt -werden. Von einem `delete'-Befehl entfernter Text (in der Regel -einzelne Zeichen, leere Zeilen und Zwischenrume) wird nicht extra -gespeichert und kann daher auch nicht zurckgeholt werden. +Deutschen leider nicht gut wiedergeben kann): killing (umbringen) +und deleting (lschen). Wenn man sich vorstellt, dass yanking den +Begriff von den Toten erwecken darstellt, dann hat man ungefhr eine +Vorstellung von der Metapher -- Von einem kill-Befehl gelschter +Text wird gespeichert und kann bei Bedarf mit C-y zurckgeholt werden. +Von einem delete-Befehl entfernter Text (in der Regel einzelne +Zeichen, leere Zeilen und Zwischenrume) wird nicht extra gespeichert +und kann daher auch nicht zurckgeholt werden. Allerdings besteht die +Mglichkeit zum Undo, siehe weiter unten. >> Bringen Sie den Cursor an den Anfang einer nicht-leeren Zeile und geben Sie C-k ein, um die Zeile zu lschen. @@ -495,12 +483,16 @@ behandelt: es l Zeilenvorschbe: C-u 2 C-k lscht zwei Zeilen komplett; zweimal C-k lscht dagegen nur eine Zeile. -Wie schon erwhnt, bringt C-y den zuletzt gelschten (`gekillten') +Wie schon erwhnt, bringt C-y den zuletzt gelschten (gekillten) Text zurck -- man kann diesen Text einfgen, wo man will: an der ursprnglichen Stelle, an einer anderen Stelle, oder sogar in einer anderen Datei. Mehrmaliges Ausfhren von C-y fgt den Text mehrmals ein. +In anderen Editoren wird kill und yank oft als cut +(ausschneiden) und paste (einfgen) bezeichnet. Nheres dazu findet +sich im Abschnitt Glossary des Emacs-Handbuchs. + >> Probieren Sie jetzt C-y, um diesen Effekt zu sehen. Fhren Sie C-k mehrmals hintereinander aus, dann wird der so @@ -509,14 +501,14 @@ Text zur >> Drcken Sie mehrmals C-k. -Holen Sie jetzt den Text `von den Toten' zurck: +Holen Sie jetzt den Text von den Toten zurck: >> Drcken Sie C-y. Bewegen Sie dann den Cursor ein paar Zeilen nach unten und drcken Sie C-y erneut. Der eben eingefgte Text wird noch einmal an anderer Stelle kopiert. Wie knnen Sie gelschten Text wieder einfgen, wenn Sie in der -Zwischenzeit noch etwas anderes `gekillt' haben? C-y wrde das +Zwischenzeit noch etwas anderes gekillt haben? C-y wrde das zuletzt gelschte Textstck zurckholen, was aber nicht das gewnschte ist. Verwenden Sie nun M-y (unmittelbar nach der erstmaligen Ausfhrung von C-y), um den gerade mit C-y eingefgten Textteil durch @@ -546,7 +538,7 @@ durchgesehen. Die meisten graphischen Oberflchen bieten auch die Mglichkeit, mit der linken Maustaste einen Textteil zu markieren (er erscheint dann normalerweise grau unterlegt). Der Befehl C-w lscht diesen -markierten Textteil (in Emacs auch `Region' genannt) und fgt ihn in +markierten Textteil (in Emacs auch Region genannt) und fgt ihn in den Lschring ein. Dasselbe geht auch ohne Maus: Bewegen Sie den Cursor zum Beginn des zu @@ -562,54 +554,48 @@ man Befehle mit langen Namen ausf ------ Wenn Sie etwas am Text gendert haben und nachtrglich bemerken, dass -das ein Fehler war, so knnen Sie den Fehler mit dem Befehl C-x u -ungeschehen machen (`undo'). +das ein Fehler war, so knnen Sie den Fehler mit dem Befehl C-/ +ungeschehen machen (undo). -Normalerweise macht C-x u das Verhalten von einem Befehl ungeschehen; -fhren Sie C-x u mehrmals hintereinander aus, werden die jeweiligen +Normalerweise macht C-/ das Verhalten von einem Befehl ungeschehen; +fhren Sie C-/ mehrmals hintereinander aus, werden die jeweiligen vorigen Befehle widerrufen. Es gibt jedoch zwei Ausnahmen: Befehle, die den Text nicht ndern, werden nicht gezhlt (z.B. Cursorbewegungen und Blttern im Text). -Und Befehle, die sich selbst einfgen (`self-inserting': Drcken Sie -zum Beispiel die `u'-Taste, dann wird der Buchstabe u eingefgt) +Und Befehle, die sich selbst einfgen (self-inserting: Drcken Sie +zum Beispiel die u-Taste, dann wird der Buchstabe u eingefgt) werden in Gruppen von bis zu 20 Zeichen wiederhergestellt, um die -Anzahl der notwendigen C-x u-Befehle zu reduzieren. +Anzahl der notwendigen C-/-Befehle zu reduzieren. >> Lschen Sie diese Zeilen mit C-k und drcken Sie anschlieend - mehrmals C-x u, und die Zeilen erscheinen wieder. + mehrmals C-/, und die Zeilen erscheinen wieder. -C-_ ist ein alternativer Undo-Befehl; er arbeitet genauso wie C-x u, -ist jedoch einfacher zu tippen, wenn Sie den Befehl mehrmals -hintereinander ausfhren mchten. Der Nachteil von C-_ ist, dass bei -manchen Tastaturen nicht sofort einsichtig ist, wie man das eingibt. - -Eine weitere Eingabemglichkeit bei vielen Terminals ist C-/. - -Ein numerisches Argument fr C-_, C-x u oder C-/ wird als +Alternative Tastenkombinationen fr C-/ sind C-_ und C-x u. Ein +numerisches Argument fr C-/, C-_ oder C-x u wird als Wiederholungszhler interpretiert. Der Unterschied zwischen der Undo-Funktion und dem oben erklrten C-y ist, dass erstere gelschten Text an exakt der gleichen Position wie vorher wiederherstellt, wohingegen C-y den gelschten Text an der -momentanen Cursorposition einfgt. Im brigen kann auch `gekillter' -Text wieder hergestellt werden; der Unterschied zwischen `killing' und -`yanking' betrifft nur C-y, aber nicht die Undo-Funktion. +momentanen Cursorposition einfgt. Im brigen kann auch gekillter +Text wieder hergestellt werden; der Unterschied zwischen killing und +yanking betrifft nur C-y, aber nicht die Undo-Funktion. * DATEIEN --------- -Um editierten Text zu sichern, muss man ihn in einer Datei (`file') -speichern (`save'). Wird Emacs beendet, ohne dass man vorher den Text +Um editierten Text zu sichern, muss man ihn in einer Datei (file) +speichern (save). Wird Emacs beendet, ohne dass man vorher den Text gespeichert hat, dann ist der Text verloren. Will man andererseits bereits gesicherten Text mit Emacs editieren, so muss die entsprechende Datei in Emacs geladen werden (im Englischen -wird das als `finding' (finden) bzw. als `visiting' (besuchen) +wird das als finding (finden) bzw. als visiting (besuchen) bezeichnet). -Eine Datei `finden' bedeutet, dass man den Inhalt dieser Datei mit +Eine Datei finden bedeutet, dass man den Inhalt dieser Datei mit Emacs bearbeitet -- es ist fast so, als ob man die Datei selbst editiert. Jedoch werden nderungen an dieser Datei erst dann dauerhaft, wenn man sie speichert; auf diese Weise wird vermieden, @@ -621,9 +607,9 @@ die Wenn Sie die untere Bildschirmkante genauer betrachten, dann werden Sie eine Zeile finden, die mit einem oder mehreren Bindestrichen beginnt und endet; sie enthlt unter anderem die Zeichenkette -`TUTORIAL.de'. An dieser Position befindet sich immer der Name der -Datei, die Sie momentan bearbeiten (`visit'). Gerade in diesem -Augenblick bearbeiten Sie eine Datei mit dem Namen `TUTORIAL.de' +TUTORIAL.de. An dieser Position befindet sich immer der Name der +Datei, die Sie momentan bearbeiten (visit). Gerade in diesem +Augenblick bearbeiten Sie eine Datei mit dem Namen TUTORIAL.de (genauer gesagt, Emacs hat eine identische Kopie geladen). Die Befehle fr das Laden und Speichern von Dateien bestehen aus zwei @@ -634,14 +620,14 @@ drei oder vier Zeichen lang -- Sie haben bereits C-x u und C-x 1 kennengelernt. Um eine Datei in Emacs laden zu knnen, muss man dem Lade-Befehl den -Namen der Datei mitteilen. Der Befehl `liest ein Argument vom -Terminal' (in diesem Fall ist das der Name der Datei). Nachdem Sie +Namen der Datei mitteilen. Der Befehl liest ein Argument (in diesem +Fall ist das der Name der Datei). Nachdem Sie C-x C-f (lade Datei) eingegeben haben, werden Sie von Emacs nach dem Dateinamen gefragt. Die Zeichen, die Sie eingeben, werden in der untersten Bildschirmzeile -dargestellt, dem sogenannten Minipuffer (`minibuffer'). Sie knnen +dargestellt, dem sogenannten Minipuffer (minibuffer). Sie knnen ganz normale Emacs-Editierfunktionen verwenden, um den Dateinamen zu ndern. @@ -653,39 +639,42 @@ Minipuffer benutzen) mit C-g abbrechen. ab (Sie haben also keine Datei geladen). Wenn Sie den Dateinamen fertig eingegeben haben, drcken Sie , -um den Befehl abzuschlieen; C-x C-f wird ausgefhrt und ldt die von -Ihnen ausgesuchte Datei. Der Minipuffer verschwindet wieder, sobald -C-x C-f beendet ist. +um den Befehl abzuschlieen. Der Minipuffer verschwindet wieder, und +C-x C-f ldt die von Ihnen ausgesuchte Datei. -Ein paar Augenblicke spter erscheint der Dateiinhalt auf dem -Bildschirm, und Sie knnen den Text editieren. Wenn Sie Ihre -nderungen permanent speichern wollen, dann drcken Sie +Der Dateiinhalt erscheint jetzt auf dem Bildschirm, und Sie knnen den +Text editieren. Wenn Sie Ihre nderungen permanent speichern wollen, +dann drcken Sie C-x C-s (sichere Datei) und Emacs kopiert den Text in die Datei. Beim ersten Mal benennt Emacs die Originaldatei um, damit sie nicht verloren ist. Der neue -Name besteht aus dem Originalnamen plus einer angehngten Tilde `~' +Name besteht aus dem Originalnamen plus einer angehngten Tilde ~ [unter einigen Betriebssystemen wird statt dessen die -Namenserweiterung durch `.bak' ersetzt]. +Namenserweiterung durch .bak ersetzt]. Emacs schreibt den Namen der gesicherten Datei in die unterste Zeile, sobald C-x C-s fertig ausgefhrt ist. Sie sollten den editierten Text oft speichern, damit nicht allzuviel bei einem etwaigen Systemabsturz -verloren geht. +verloren geht (siehe auch den Abschnitt AUTOMATISCHES SPEICHERN +weiter unten). + +>> Geben Sie + + C-x C-s TUTORIAL.de ->> Geben Sie C-x C-s ein, um Ihre Kopie der Einfhrung zu sichern. - Die Ausgabe am unteren Bildschirmrand sollte `Wrote ...TUTORIAL.de' - sein. + ein, um Ihre Kopie der Einfhrung zu sichern. Die Ausgabe am + unteren Bildschirmrand sollte Wrote ...TUTORIAL.de sein. [Manche Terminals werden durch C-s angehalten und mssen durch C-q -wieder `entsperrt' werden. Eine erste Abhilfe zur Umschiffung dieses -C-s-Problems schafft die Befehlsfolge `M-x save-buffer', welche exakt +wieder entsperrt werden. Eine erste Abhilfe zur Umschiffung dieses +C-s-Problems schafft die Befehlsfolge M-x save-buffer, welche exakt das gleiche wie C-x C-s bewirkt. Mehr Hilfe dazu finden Sie im -Abschnitt `Spontaneous Entry to Incremental Search' im +Abschnitt Spontaneous Entry to Incremental Search im Emacs-Handbuch.] -Sie knnen eine existierende Datei anschauen (`view') oder editieren. +Sie knnen eine existierende Datei anschauen (view) oder editieren. Sie knnen aber auch eine Datei laden, die noch gar nicht existiert, um so eine neue Datei zu erzeugen: Sie ffnen dazu die (nicht-existente) Datei, die natrlich leer ist, und beginnen dann @@ -703,18 +692,8 @@ laden, dann bleibt die erste in Emacs. Sie k zurckschalten, indem Sie noch einmal C-x C-f eingeben. Auf diese Weise lassen sich eine ganze Reihe von Dateien laden und bearbeiten. ->> Erzeugen Sie eine Datei mit dem Namen `foo', indem Sie - - C-x C-f foo - - eingeben. Tippen Sie etwas Text ein, editieren Sie ihn und - speichern Sie ihn abschlieend mit C-x C-s. Kehren Sie - anschlieend zu dieser Einfhrung zurck mit - - C-x C-f TUTORIAL.de - Emacs speichert jeden Text, der aus einer Datei in Emacs geladen wird, -in einem `Puffer'-Objekt. Um eine Liste der momentan existierenden +in einem Puffer-Objekt. Um eine Liste der momentan existierenden Puffer zu sehen, geben Sie C-x C-b (liste Puffer auf) @@ -726,7 +705,7 @@ ein. Beachten Sie, dass jeder Puffer einen Namen hat und manche auch mit dem Namen einer Datei assoziiert sind, dessen Inhalt sie enthalten. Manche Puffer aber haben keinen zugehrige Datei, z.B. der mit dem -Namen `*Buffer List*'. Er wurde von dem Befehl C-x C-b erzeugt, um +Namen *Buffer List*. Er wurde von dem Befehl C-x C-b erzeugt, um die Pufferliste darzustellen. JEDER Text, den Sie innerhalb Emacs in einem Fenster sehen, ist immer ein Ausschnitt eines Puffers. @@ -734,28 +713,39 @@ einem Fenster sehen, ist immer ein Ausschnitt eines Puffers. zu lassen. Wieviele Puffer auch in Emacs geladen sind, nur ein einziger ist der -`momentane' Puffer, nmlich derjenige, den Sie gerade editieren. Will +momentane Puffer, nmlich derjenige, den Sie gerade editieren. Will man einen anderen Puffer editieren, muss man zuerst zu diesem Puffer -wechseln (`switch'). Wie schon weiter oben erklrt, kann man mittels +wechseln (switch). Wie schon weiter oben erklrt, kann man mittels C-x C-f zu einem Puffer wechseln, der zu einer Datei gehrt. Emacs hat jedoch einen einfacheren Befehl, C-x b, um einen beliebigen Puffer namentlich auszuwhlen. ->> Geben Sie C-x b foo ein, um zurck zum Puffer `foo' zu - schalten, der den Text der Datei `foo' enthlt. Anschlieend geben - Sie C-x b TUTORIAL.de ein, um wieder zu dieser Einfhrung - zu gelangen. +>> Geben Sie + + C-x C-f foo + + ein, um eine Datei mit dem Namen foo zu erzeugen. Mittels + + C-x b TUTORIAL.de + + gelangen Sie wieder zu dieser Einfhrung. In der Regel ist der Puffername identisch zu einem Dateinamen (ohne den Verzeichnisprfix), jedoch nicht immer. Die von C-x C-b erzeugte -Pufferliste zeigt stets die Namen aller Puffer. +Pufferliste zeigt stets die Namen aller Puffer mit den +korrespondierenden Dateinamen. JEDER Text in Emacs ist Teil eines Puffers, aber nicht jeder Puffer -entspricht einer Datei. So ist z.B. der Puffer `*Buffer List*' mit +entspricht einer Datei. So ist z.B. der Puffer *Buffer List* mit keiner Datei assoziiert -- er wurde direkt von dem Befehl C-x C-b -erzeugt. Genauso hat der Puffer `*Messages*' keine Entsprechung als -Datei; er enthlt alle Mitteilungen, die in der untersten Zeile -whrend des Arbeitens mit Emacs erscheinen. +erzeugt. Auch dieser TUTORIAL.de-Puffer war anfangs keiner Datei +zugeordnet, jetzt allerdings schon, denn Sie haben im letzten +Abschnitt den Befehl C-x C-s eingegeben und so den Pufferinhalt als +Datei gespeichert. + +Der Puffer *Messages* hat ebenfalls keine Entsprechung als Datei; er +enthlt alle Mitteilungen, die in der untersten Zeile whrend des +Arbeitens mit Emacs erscheinen. >> Geben Sie C-x b *Messages* ein, um sich den Mitteilungspuffer anzuschauen. @@ -778,7 +768,7 @@ Sie ihn speichern wollen. >> Fgen Sie eine Textzeile ein und drcken Sie dann C-x s. Emacs fragt Sie jetzt, ob Sie einen Puffer mit dem Namen - TUTORIAL.de speichern wollen. Bejahen Sie, indem Sie `y' drcken. + TUTORIAL.de speichern wollen. Bejahen Sie, indem Sie y drcken. [Anmerkung: Sie verndern nicht die Originaldatei, sondern eine persnliche Kopie.] @@ -793,7 +783,7 @@ sie trotzdem alle benutzen zu k C-x Zeichenerweiterung. Gefolgt von einem Zeichen. M-x Befehlserweiterung. Gefolgt von einem (langen) Namen. -[Das `x' steht fr das englische Wort `extension'.] Diese beiden +[Das x steht fr das englische Wort extension.] Diese beiden Befehle sind prinzipiell sehr ntzlich, werden aber weniger oft bentigt als die bisher vorgestellten. Sie haben bereits mehrere Befehle aus der ersten Kategorie kennengelernt; unter anderem C-x C-f, @@ -804,31 +794,25 @@ vielleicht vergessen haben, Daten oder Text zu sichern -- Emacs fragt bei jedem gendertem Puffer (bzw. Datei), ob er gespeichert werden soll. -C-z ist der Befehl um Emacs *zeitweise* zu verlassen; es ist also -mglich, spter an der unterbrochenen Stelle nahtlos weiterzuarbeiten. - -Auf den meisten Systemen wie Linux oder FreeBSD wird Emacs -`suspendiert', wenn Sie C-z drcken, d.h., Sie kehren zurck zur -Eingabezeile des Betriebssystems, ohne Emacs zu beenden. In der Regel -knnen Sie dann mittels des Befehls `fg' bzw. `%emacs' wieder zu Emacs -umschalten. Unter graphischen Oberflchen wie X11 bewirkt C-z in der -Regel, dass Emacs ikonofiziert wird, also als Ikone (`Icon') darauf -wartet, mit einem Mausklick bei Bedarf wieder vergrert zu werden. +Unter graphischen Oberflchen wie X bewirkt C-z in der Regel, dass +Emacs ikonofiziert wird, also als Ikone (Icon) darauf wartet, mit +einem Mausklick bei Bedarf wieder vergrert zu werden. Auf einem +Textterminal dagegen wird Emacs suspendiert, wenn Sie C-z drcken, +d.h., Sie kehren zurck zur Eingabezeile des Terminals, ohne Emacs zu +beenden, und knnen beliebige andere Befehle ausfhren. In der Regel +knnen Sie spter mittels des Befehls fg bzw. %emacs wieder zu +Emacs umschalten. Bei Betriebssystemen bzw. Shells, die Suspension von Programmen nicht implementiert haben (z.B. MS-DOS), startet C-z einen -System-Befehlsinterpreter innerhalb von Emacs (`subshell'). -Normalerweise mssen Sie dann `exit' in die Befehlszeile schreiben, um +System-Befehlsinterpreter innerhalb von Emacs (subshell). +Normalerweise mssen Sie dann exit in die Befehlszeile schreiben, um zu Emacs zurckzukehren. Der beste Zeitpunkt fr C-x C-c ist, wenn Sie sich ausloggen (bzw. Ihren Computer ausschalten); Sie sollten Emacs ebenfalls beenden, wenn Sie Emacs von einem anderen Programm aus aufgerufen -haben (z.B. einem Programm, das E-mails liest), da solche Programme -oft nicht wissen, wie sie mit Emacs im Suspend-Modus umgehen sollen. -In allen anderen Fllen ist es meistens gnstiger, C-z zu benutzen und -Emacs nicht zu beenden, damit man im Bedarfsfalle sofort an der -gleichen Stelle weiterarbeiten kann. +haben (z.B. einem Programm, das E-mails liest). Hier ist eine Liste aller C-x-Befehle, die Sie bereits kennengelernt haben: @@ -846,19 +830,19 @@ Ein Beispiel f global (also in der ganzen Datei bzw. Puffer) eine Zeichenkette durch eine andere ersetzt. Wenn Sie M-x drcken, dann fragt Sie Emacs in der untersten Bildschirmzeile nach dem Namen des Befehls (in diesem -Fall `replace-string'). Geben Sie jetzt `repl s' ein und Emacs +Fall replace-string). Geben Sie jetzt repl s ein und Emacs vervollstndigt den Namen. Schlieen Sie die Eingabe mit ab. [ bezeichnet die Tabulatortaste.] >> Bewegen Sie den Cursor zu der leeren Zeile sechs Zeilen unter dieser. Geben Sie dann - M-x repl sBildschirmText + M-x repl s Bildschirm Text ein und kehren Sie mit C-u C-SPC an diese Position zurck. Beachten Sie wie diese Bildschirmzeile jetzt aussieht: Sie haben - den Wortteil B-i-l-d-s-c-h-i-r-m durch `Text' ersetzt (und zwar im + den Wortteil B-i-l-d-s-c-h-i-r-m durch Text ersetzt (und zwar im ganzen Dokument beginnend von der Cursorposition). >> Drcken Sie jetzt C-x u, um diese nderungen auf einmal rckgngig @@ -872,17 +856,17 @@ Haben Sie gespeichert, dann knnen sie verloren gehen, falls der Computer abstrzt. Um Sie davor zu schtzen, sichert Emacs in bestimmten Zeitintervallen jede von Ihnen editierte Datei in sogenannten -`auto save'-Dateien. Sie sind daran zu erkennen, dass sie mit einem # -beginnen und enden; z.B. ist `#hello.c#' der Name der Auto-Save-Datei -von `hello.c'. Wenn Sie Ihren Text auf normalem Wege speichern, wird +auto save-Dateien. Sie sind daran zu erkennen, dass sie mit einem # +beginnen und enden; z.B. ist #hello.c# der Name der Auto-Save-Datei +von hello.c. Wenn Sie Ihren Text auf normalem Wege speichern, wird die Auto-Save-Datei gelscht. Strzt der Rechner einmal wirklich ab, knnen Sie die nderungen, die beim letzten Auto-Save gespeichert worden sind, folgendermaen wiederherstellen: Laden Sie die Datei auf normalem Wege (die Datei, die Sie bearbeitet haben, nicht die Auto-Save-Datei) und geben Sie -dann `M-x recover-file' ein. Wenn Emacs Sie um Besttigung -fragt, antworten Sie mit `yes', um den Inhalt der +dann M-x recover-file ein. Wenn Emacs Sie um Besttigung +fragt, antworten Sie mit yes , um den Inhalt der Auto-Save-Datei zu bernehmen. @@ -890,8 +874,8 @@ Auto-Save-Datei zu ------------------ Geben Sie Befehle langsam ein, dann zeigt Ihnen Emacs Ihre eigene -Eingabe am unteren Bildschirmrand im sogenannten Echo-Bereich (`echo -area'). Der Echo-Bereich enthlt die unterste Bildschirmzeile. +Eingabe am unteren Bildschirmrand im sogenannten Echo-Bereich (echo +area). Der Echo-Bereich enthlt die unterste Bildschirmzeile. [Mini-Puffer und Echo-Bereich fallen normalerweise zusammen, sind aber nicht das gleiche, da innerhalb des Echo-Bereiches nichts eingegeben @@ -902,30 +886,30 @@ werden kann.] ------------------ Die Bildschirmzeile unmittelbar ber dem Echo-Bereich ist die -Statuszeile (`mode line'). Sie schaut ungefhr so aus: +Statuszeile (mode line). Sie schaut ungefhr so aus: --1:** TUTORIAL.de 59% L905 (Fundamental)---------------------- +-1:**- TUTORIAL.de 58% L891 (Fundamental) Diese Zeile gibt ntzliche Hinweise ber den momentanen Zustand von Emacs und den Text, den Sie gerade editieren. -Sie wissen bereits, was der Dateiname bedeutet. `--NN%--' zeigt die -momentane Position innerhalb des Textes an: NN Prozent davon sind -oberhalb des Bildschirms. Ist der Dateianfang zu sehen, dann -erscheint `Top' anstelle von `00%'. Analog dazu erscheint `Bot' (fr -das englische Wort `bottom'), wenn das Dateiende sichtbar ist. Wenn -Sie einen Text betrachten, der komplett auf den Bildschirm passt, dann -erscheint `All'. +Sie wissen bereits, was der Dateiname bedeutet. NN% zeigt die +momentane Position innerhalb des Puffertextes an: NN Prozent davon +sind oberhalb des Bildschirms. Ist der Dateianfang zu sehen, dann +erscheint Top anstelle von 00%. Analog dazu erscheint Bot (fr +das englische Wort bottom), wenn das Dateiende sichtbar ist. Wenn +Sie einen Puffer betrachten, der komplett auf den Bildschirm passt, +dann erscheint All. -Das `L' und die nachfolgenden Ziffern geben die aktuelle Zeilennummer +Das L und die nachfolgenden Ziffern geben die aktuelle Zeilennummer an, in der sich der Cursor befindet. -Am Anfang der Zeile sehen Sie `-1:**'. Die Zeichen vor dem +Am Anfang der Zeile sehen Sie -1:**-. Die Zeichen vor dem Doppelpunkt geben an, in welcher Kodierung der Text ist und welche Eingabemethode verwendet wird. Dazu mehr weiter unten im Abschnitt -`MULE'. +MULE. -[Anstelle des Doppelpunktes knnen auch ein `\' und `/' stehen, falls +[Anstelle des Doppelpunktes knnen auch ein \ und / stehen, falls Sie Dateien editieren, die der MS-DOS- bzw. der Macintosh-Textkonvention folgen: MS-DOS verwendet als Zeilenvorschubzeichen CR-LF (Carriage Return gefolgt von Linefeed), @@ -938,24 +922,24 @@ Prozentzeichen nach dem Doppelpunkt stehen f gelesen, aber nicht editiert werden kann. Der eingeklammerte Teil gibt an, in welchem Editiermodus Sie sich -befinden. Der Standardmodus heit `Fundamental' (Sie verwenden ihn -gerade); er ist ein Beispiel fr einen Hauptmodus (`major mode'). +befinden. Der Standardmodus heit Fundamental (Sie verwenden ihn +gerade); er ist ein Beispiel fr einen Hauptmodus (major mode). Emacs hat viele Hauptmodi implementiert. Manche davon werden fr verschiedene (Computer-)Sprachen und/oder Textarten verwendet, z.B. Lisp-Modus, Text-Modus usw. Es kann immer nur ein Hauptmodus aktiviert sein, und der Name befindet sich dort, wo jetzt gerade -`Fundamental' steht. +Fundamental steht. Einige Befehle verhalten sich jeweils in verschiedenen Hauptmodi anders. Es gibt zum Beispiel einen Befehl, um einen Kommentar in den Quellcode eines Computerprogramm einzufgen -- die Tastenfolge dafr ist zwar (in der Regel) die gleiche, doch wird ein Kommentar mit der fr die aktuelle Programmiersprache gltigen Syntax eingefgt -(z.B. `// ...' fr ein Programm in C++ oder `; ...' fr Lisp). Um in +(z.B. // ... fr ein Programm in C++ oder ; ... fr Lisp). Um in einen Hauptmodus zu schalten, hngen Sie einfach das englische Wort -`-mode' an den (kleingeschriebenen) Namen des Modus an und fhren den -Befehl mittels M-x aus. Beispiel: `M-x fundamental-mode' schaltet in +-mode an den (kleingeschriebenen) Namen des Modus an und fhren den +Befehl mittels M-x aus. Beispiel: M-x fundamental-mode schaltet in den Fundamental-Modus. Weitere wichtige Modi sind c-mode, perl-mode, lisp-mode, text-mode u.a. Die meisten davon werden automatisch aktiviert, und zwar entsprechend der Namenserweiterung der zu ladenden @@ -965,30 +949,30 @@ C-Modus aktiviert. Wenn Sie deutschen oder englischen Text bearbeiten, dann sollten Sie den Textmodus verwenden. [Falls Ihre Tastatur keine Umlaut-Tasten hat, mssen Sie noch einen weiteren Nebenmodus aktivieren. Lesen Sie -dazu den Abschnitt `MULE' weiter unten.] +dazu den Abschnitt MULE weiter unten.] ->> Geben Sie `M-x text mode' ein. +>> Geben Sie M-x text-mode ein. Sie brauchen keine Angst zu haben, dass sich die bisher dargestellte Tastaturbelegung von Emacs stark ndert. Beobachten Sie z.B. die Befehle M-f und M-b: Apostrophe werden nun als Teil eines Wortes betrachtet (wie man's leicht an diesem Beispiel ausprobieren kann), wohingegen im Fundamentalmodus Apostrophe als Worttrenner -(`word-separator') behandelt werden. +(word-separator) behandelt werden. Normalerweise ist das eben genannte Beispiel die Methode von -Hauptmodi: Die meisten Befehle tun `das gleiche', arbeiten aber +Hauptmodi: Die meisten Befehle tun das gleiche, arbeiten aber jeweils ein bisschen anders. Dokumentation zum derzeit aktuellen Hauptmodus bekommen Sie mit C-h m. ->> Drcken Sie C-u C-v ein- oder mehrmals, um diese Zeile in die Nhe - des oberen Bildschirmrands zu bringen. +>> Drcken Sie C-l C-l, um diese Zeile an den oberen Bildschirmrand zu + bringen. >> Lesen Sie nun mittels C-h m die englische Dokumentation zum Textmodus. >> Entfernen Sie schlielich das Dokumentationsfenster mit C-x 1. -Neben den Hauptmodi gibt es auch Nebenmodi (`minor modes'). Nebenmodi +Neben den Hauptmodi gibt es auch Nebenmodi (minor modes). Nebenmodi sind keine Alternativen zu Hauptmodi, sondern stellen Ergnzungen zur Verfgung, die (normalerweise) in allen Hauptmodi funktionieren (z.B. der berschreibmodus: Zeichen werden nicht eingefgt, sondern @@ -998,20 +982,20 @@ Sie k Nebenmodi haben. Ein Nebenmodus, welcher uerst ntzlich ist, besonders fr das -Editieren von Text, ist der automatische Zeilenumbruch (`Auto Fill -mode'). Ist dieser Modus aktiviert, dann bricht Emacs die laufende +Editieren von Text, ist der automatische Zeilenumbruch (Auto Fill +mode). Ist dieser Modus aktiviert, dann bricht Emacs die laufende Zeile selbstttig zwischen Wrtern um, sobald sie zu lang wird. -Sie knnen den Zeilenumbruchmodus einschalten mittels `M-x auto fill -mode'. Wenn der Modus aktiviert ist, knnen Sie ihn mit dem -gleichen Befehl wieder ausschalten. Mit anderen Worten, der Befehl -verhlt sich wie ein Lichttaster, der bei Bettigung entweder das -Licht ein- oder ausschaltet, je nachdem, ob das Licht vorher +Sie knnen den Zeilenumbruchmodus mittels M-x auto-fill-mode + einschalten. Wenn der Modus aktiviert ist, knnen Sie ihn +mit dem gleichen Befehl wieder ausschalten. Mit anderen Worten, der +Befehl verhlt sich wie ein Lichttaster, der bei Bettigung entweder +das Licht ein- oder ausschaltet, je nachdem, ob das Licht vorher ausgeschaltet bzw. eingeschaltet war. Wir sagen, dass dieser Befehl -den Modus umschaltet (`toggle'). +den Modus umschaltet (toggle). ->> Geben Sie nun M-x auto fill mode ein. Fgen Sie - anschlieend eine Zeile ein, die aus lauter `asdf ' besteht, und +>> Geben Sie nun M-x auto-fill-mode ein. Fgen Sie + anschlieend eine Zeile ein, die aus lauter asdf besteht, und zwar so lange, bis die Zeile automatisch umgebrochen wird. Vergessen Sie nicht, Leerzeichen einzugeben, da nur dort ein Umbruch erfolgt. @@ -1038,56 +1022,56 @@ Absatzes stehen muss. * SUCHEN -------- -Emacs kann Zeichenketten (`strings') entweder in Richtung Pufferende -(vorwrts, `forward') oder in Richtung Pufferanfang (rckwrts, -`backward') suchen. Gleichzeitig wird der Cursor an die nchste -Stelle bewegt, wo diese Zeichenkette erscheint. +Emacs kann Zeichenketten (strings, eine Folge von zusammenhngenden +Zeichen) entweder in Richtung Pufferende (vorwrts, forward) oder in +Richtung Pufferanfang (rckwrts, backward) suchen. Gleichzeitig +wird der Cursor an die nchste Stelle bewegt, wo diese Zeichenkette +erscheint. -Hier unterscheidet sich Emacs von vielen anderen Editoren, da nmlich -die Standard-Suchoperation inkrementelles Suchen ist, d.h., die Suche -beginnt dann, wenn Sie die Zeichen eingeben. +Die Standard-Suchoperation von Emacs ist inkrementelles Suchen, d.h., +die Suche beginnt dann, wenn Sie die Zeichen eingeben. Der Befehl fr Vorwrtssuchen ist C-s und C-r fr Rckwrtssuchen. ABER HALT! Probieren Sie bitte diese Befehle noch nicht. -Wenn Sie C-s eingeben, dann erscheint die Zeichenkette `I-search:' als +Wenn Sie C-s eingeben, dann erscheint die Zeichenkette I-search: als Eingabeaufforderung im Echobereich. Das bedeutet, dass Emacs jetzt eine inkrementellen Suche ausfhrt und darauf wartet, dass Sie die zu suchende Zeichenkette eingeben. beendet die Suche. >> Geben Sie jetzt C-s ein, um einen Suchvorgang zu starten. Schreiben - Sie LANGSAM, einen Buchstaben nach dem anderen, das Wort `Cursor', + Sie LANGSAM, einen Buchstaben nach dem anderen, das Wort Cursor, und warten Sie jeweils ab, was mit dem Cursor passiert. Sie haben - jetzt das Wort `Cursor' einmal gefunden. + jetzt das Wort Cursor einmal gefunden. >> Drcken Sie C-s noch einmal, um die nchste Stelle zu suchen, wo das - Wort `Cursor' vorkommt. ->> Drcken Sie nun viermal und beobachten Sie, wie der Cursor + Wort Cursor vorkommt. +>> Drcken Sie nun viermal und beobachten Sie, wie der Cursor zurckspringt. >> Beenden Sie die Suche mit . Verstehen Sie, was gerade vorgegangen ist? Emacs versucht whrend einer inkrementellen Suche zu der Stelle zu gehen, wo die Zeichenkette steht, die Sie bis jetzt eingegeben haben. Um die darauffolgende -Position zu suchen, wo `Cursor' steht, gengt es, noch einmal C-s zu +Position zu suchen, wo Cursor steht, gengt es, noch einmal C-s zu bettigen. Wenn es keine nchste Position gibt, dann ertnt ein kurzer Ton, und Emacs sagt Ihnen, dass die Suche im Augenblick -fehlschlgt (`failing'). C-g beendet ebenfalls einen Suchvorgang. +fehlschlgt (failing). C-g beendet ebenfalls einen Suchvorgang. Wenn Sie sich mitten in einer inkrementellen Suche befinden und - drcken, wird das letzte Zeichen im Suchstring gelscht, und + drcken, wird das letzte Zeichen im Suchstring gelscht, und der Cursor springt zurck auf die letzte Suchposition. Angenommen, -Sie haben `c' eingegeben, um das erste Auftreten von `c' zu suchen. -Geben Sie jetzt `u' ein, dann springt der Cursor zu dem ersten -Auftreten der Zeichenkette `cu'. Wenn Sie jetzt mit das `u' -vom Suchstring lschen, dann springt der Cursor zurck zum ersten `c'. -Drcken Sie dagegen ein paar mal C-s, um weitere `cu'-Zeichenketten zu -finden, dann bewirkt , dass Sie zum letzten Auftreten von `cu' -zurckspringen, und erst wenn es kein weiteres `cu' mehr gibt, springt -der Cursor zum ersten `c' zurck. +Sie haben c eingegeben, um das erste Auftreten von c zu suchen. +Geben Sie jetzt u ein, dann springt der Cursor zu dem ersten +Auftreten der Zeichenkette cu. Wenn Sie jetzt mit das u +vom Suchstring lschen, dann springt der Cursor zurck zum ersten c. +Drcken Sie dagegen ein paar mal C-s, um weitere cu-Zeichenketten zu +finden, dann bewirkt , dass Sie zum letzten Auftreten von cu +zurckspringen, und erst wenn es kein weiteres cu mehr gibt, springt +der Cursor zum ersten c zurck. Die Suche wird ebenfalls beendet, wenn Sie ein CONTROL- oder -META-Zeichen eingeben (mit ein paar Ausnahmen -- Zeichen, die -bei einer Suche speziell gehandhabt werden wie C-s oder C-r). +META-Zeichen eingeben (mit ein paar Ausnahmen -- Zeichen, die bei +einer Suche speziell gehandhabt werden wie C-s oder C-r). C-s versucht, die Zeichenkette NACH der aktuellen Cursorposition zu finden. Wollen Sie etwas davor suchen, mssen Sie C-r verwenden. Das @@ -1101,7 +1085,11 @@ Suchrichtung. Eine weitere, ntzliche Fhigkeit von Emacs ist die Mglichkeit, mehr als ein Fenster zur gleichen Zeit auf dem Bildschirm darzustellen. ->> Bewegen Sie den Cursor zu dieser Zeile und geben Sie C-u 0 C-l ein. +[Der Unterschied zu graphischen Fenstern im herkmmlichen Sinn +(frame in der Emacs-Terminologie) wurde bereits weiter oben +besprochen.] + +>> Bewegen Sie den Cursor zu dieser Zeile und geben Sie C-l C-l ein. >> Drcken Sie nun C-x 2, um den Bildschirm in zwei Fenster zu teilen. Beide Fenster zeigen diese Einfhrung an, und der Cursor bleibt im @@ -1111,8 +1099,8 @@ als ein Fenster zur gleichen Zeit auf dem Bildschirm darzustellen. statt dessen auch ESC C-v verwenden, falls Sie keine META-Taste haben; siehe auch weiter unten). ->> Mittels C-x o (das `o' steht fr das englische Wort `other', `das - andere') knnen Sie den Cursor in das untere Fenster bewegen. +>> Mittels C-x o (das o steht fr das englische Wort other, das + andere) knnen Sie den Cursor in das untere Fenster bewegen. >> Bentzen Sie C-v und M-v, um im unteren Fenster zu blttern. Lesen Sie die Emacs-Einfhrung jedoch im oberen Fenster weiter. @@ -1122,16 +1110,16 @@ als ein Fenster zur gleichen Zeit auf dem Bildschirm darzustellen. C-x o ist der Befehl, um zwischen (Emacs-)Fenstern hin- und herzuschalten. Jedes Fenster hat eine eigene Cursorposition, aber nur -das aktuelle Fenster zeigt den Cursor an (unter X11 wird die -nicht-aktuelle Cursorposition durch ein leeres Rechteck dargestellt). -Alle normalen Editierbefehle betreffen das Fenster, in dem sich der -Cursor befindet. Wir nennen dieses Fenster `ausgewhlt' (`selected -window'). +das aktuelle Fenster zeigt den Cursor an (auf einer graphischen +Oberflche wird die nicht-aktuelle Cursorposition durch ein leeres +Rechteck dargestellt). Alle normalen Editierbefehle betreffen das +Fenster, in dem sich der Cursor befindet. Wir nennen dieses Fenster +ausgewhlt (selected window). Der Befehl M-C-v ist sehr ntzlich, wenn man Text in einem Fenster -editiert und das andere Fenster als Referenz verwendet. Der Cursor -bleibt stets im gleichen Arbeitsfenster, und mit M-C-v kann man bequem -vorwrtsblttern. +editiert und das andere Fenster als Referenz verwendet. Ohne das +momentante Arbeitsfenster verlassen zu mssen, kann man mit M-C-v im +anderen Fenster bequem vorwrtsblttern. M-C-v ist ein Beispiel eines CONTROL-META-Zeichens. Haben Sie eine META-Taste, dann kann man M-C-v erzeugen, indem man CTRL und META @@ -1147,24 +1135,24 @@ META oder CTRL. Der umgekehrte Befehl zu M-C-v ist M-C-S-v, um im anderen Fenster rckwrts zu blttern (d.h., Sie mssen die META-Taste sowie die -CONTROL- und SHIFT-Taste zusammen mit `v' bettigen) -- jetzt werden +CONTROL- und SHIFT-Taste zusammen mit v bettigen) -- jetzt werden Sie wahrscheinlich verstehen, warum manche Kritiker das Wort Emacs als Abkrzung von Escape-Meta-Alt-Control-Shift betrachten. Leider funktioniert diese Befehlsfolge normalerweise nur mit graphischen -Oberflchen wie X11, da C-v von C-S-v auf den meisten Textterminals -nicht unterschieden werden kann. +Oberflchen, da C-v von C-S-v auf den meisten Textterminals nicht +unterschieden werden kann. -[Unter X11 kann man auerdem in der Regel mit den bequemeren -Tastenkombinationen META-`Bild mit Aufwrtspfeil' bzw. META-`Bild mit -Abwrtspfeil' ebenfalls im anderen Fenster rck- bzw. vorwrts -blttern.] +[Auf graphischen Oberflchen kann man auerdem in der Regel mit den +bequemeren Tastenkombinationen META-Bild mit Aufwrtspfeil +bzw. META-Bild mit Abwrtspfeil ebenfalls im anderen Fenster rck- +bzw. vorwrts blttern.] >> Entfernen Sie mit C-x 1 (eingegeben im oberen Fenster) das untere Fenster. (Htten Sie C-x 1 im unteren Fenster eingegeben, dann wre das obere -Fenster geschlossen worden -- eine Eselsbrcke fr C-x 1 ist `ich will -nur das *eine* Fenster, in dem ich mich gerade befinde.') +Fenster geschlossen worden -- eine Eselsbrcke fr C-x 1 ist ich will +nur das *eine* Fenster, in dem ich mich gerade befinde.) Sie mssen nicht den gleichen Puffer in beiden Fenstern darstellen. Wenn Sie C-x C-f verwenden, um in einem Fenster eine Datei zu laden, @@ -1184,11 +1172,42 @@ Texte darzustellen: Sie C-x 1 ein, um das untere Fenster zu schlieen. +* MEHRFACHE RAHMEN +------------------ + +Emacs kann auch mehrfache Rahmen erzeugen, sobald das Programm auf +einer graphischen Oberflche ausgefhrt wird. In der +Emacs-Terminologie bezeichnet ein Rahmen eine Gruppe von Fenstern, +gemeinsam mit deren Menus, Scrollbars, Echo-Bereichen, usw. Auf einem +Textterminal kann genau ein Rahmen dargestellt werden. + +>> Geben Sie + + M-x make-frame + + ein, um einen neuen Rahmen zu erzeugen. + +Alles, was Sie im ursprnglichen, ersten Rahmen tun knnen, +funktioniert genauso im neuen Rahmen. Beide Rahmen sind also vllig +gleichwertig. + +>> Geben Sie + + M-x delete-frame + + ein, um den ausgewhlten Rahmen zu entfernen. + +Ein Rahmen kann auch mit der normalen Methode der graphischen +Oberflche entfernt werden; meistens gibt es dafr einen Knopf mit +einem X in der linken oder rechten oberen Ecke des Rahmens. Wird +der letzte Rahmen geschlossen, beendet man Emacs, wie erwartet. + + * REKURSIVE EDITIER-EBENEN -------------------------- Manchmal kann es passieren, dass Sie in eine sogenannte rekursive -Editier-Ebene geraten (`recursive editing level'). Sie knnen das an +Editier-Ebene geraten (recursive editing level). Sie knnen das an den eckigen Klammern in der Statuszeile erkennen, welche den derzeitigen Hauptmodus zustzlich umschlieen, z.B. [(Fundamental)] anstelle von (Fundamental). @@ -1211,91 +1230,49 @@ dargestellt. Details finden Sie im Emacs-Handbuch beschrieben. * MULE ------ -Mule ist die Abkrzung fr `Multi-lingual Enhancement to GNU Emacs'. +Mule ist die Abkrzung fr Multi-lingual Enhancement to GNU Emacs. Frher wurde damit eine spezielle Emacs-Variante bezeichnet, die allerdings seit der Version 20 mit Emacs verschmolzen ist. Emacs untersttzt eine groe Anzahl von internationalen Zeichenstzen, z.B. verschiedene europische Varianten des lateinischen Alphabets, Chinesisch, Russisch oder Thai, um nur einige zu nennen. In dieser -Einfhrung wird jedoch nur auf den deutschen Zeichensatz sowie +Einfhrung wird jedoch nur auf Unicode und Latin-1 sowie Eingabemglichkeiten fr Deutsch nher eingegangen. -Der Standard-Zeichensatz fr Deutsch ist Latin-1 (auch bekannt unter -dem Namen ISO-8859-1), obwohl Unicode -- und da besonders die -Kodierungsvariante UTF-8 -- sich immer mehr durchzusetzt. Wenn -anstelle der deutschen Umlaute unansehnliche Konstrukte wie `\201' -dargestellt werden, dann ist die sogenannte -Multibyte-Zeichenuntersttzung deaktiviert (intern werden in Emacs -Nicht-ASCII-Zeichenstze durch mehr als ein Byte reprsentiert). Der -Befehl `M-x toggle-enable-multibyte-characters' aktiviert die -Multibyte-Zeichenuntersttzung. Denken Sie daran, die Tabulatortaste -zur Vervollstndigung von Befehlsnamen zu bentzen, z.B. `M-x -toggle-e'. - -Wenn anstelle der Umlaute `', `' oder `' die Zeichen `d', `v' und -`|' erscheinen (also `kleines D', `kleines V' und ein senkrechter -Strich), dann wird das achte Bit von jedem Byte abgeschnitten, sodass -nur ASCII-Zeichen dargestellt werden knnen. In der Regel gibt es -zwei Ursachen fr dieses Problem: Sie haben sich nicht `8-bit clean' -(z.B. mittels `telnet -8 ...') eingeloggt oder Ihr -Telekommunikationsprogramm ist nicht fr 8-bit konfiguriert. Beides -ist heutzutage eher unwahrscheinlich, daher wird hier nicht weiter -darauf eingegangen. - ->> Geben Sie `M-x toggle-enable-multibyte-characters' ein. Die - deutschen Umlaute (so sie von Ihrem Terminal darstellbar sind) - verschwinden und werden durch Zahlenkonstrukte ersetzt. So wird - zum Beispiel Umlaut a (`') dargestellt als `\201'. - ->> Aktivieren Sie wieder die Multibyte-Zeichenuntersttzung mittels - `M-x toggle-enable-multibyte-characters'. - -Sehen Sie anstelle der Umlaute leere Kstchen (unter X11 oder anderen -graphischen Oberflchen), sollten Sie Emacs mit C-x C-c beenden und -folgendermaen neu starten: - - emacs -fn fontset-standard - -Sie knnen auch probieren, Emacs mit der `--unibyte'-Option zu -starten, um Latin-1-Zeichen direkt darzustellen. - -Falls das alles nichts ntzt oder Sie Fragezeichen anstelle der -Umlaute auf ihrem Textterminal sehen, sollten Sie sich an Ihren -Systemadministrator wenden und sich beschweren, dass kein -Latin-1-Zeichensatz installiert ist (was heutzutage eigentlich eine -Selbstverstndlichkeit sein sollte). Falls statt der Umlaute andere -Zeichen auf ihrem Textterminal erscheinen (z.B. kyrillische -Buchstaben), dann erkundigen Sie sich, wie sie auf Latin-1 umschalten -knnen. - -Lesen Sie im Emacs-Handbuch nach unter dem Stichwort `International', +Lesen Sie im Emacs-Handbuch unter dem Stichwort International nach, welche weitere Optionen es bezglich Zeichenstze gibt. -Ist die Sprachumgebung (`locale') Ihres Betriebssystems korrekt auf -Deutsch gesetzt, verwendet Emacs diese Einstellungen automatisch. -Anderenfalls empfiehlt es sich, Latin-1 als Standardkodierung zu -aktivieren, wenn Sie primr Deutsch verwenden. Benutzen Sie zu diesem -Zweck die Befehlsfolge - - C-x l latin-1 - -(C-x l fhrt die Funktion set-language-environment aus), um -in einer laufenden Emacs-Sitzung auf Latin-1 umzuschalten. Dadurch -wird erreicht, dass Emacs beim Laden einer Datei (und Speichern -derselben) standardmig die Latin-1-Zeichenkodierung verwendet. Sie -knnen an der Ziffer 1 unmittelbar vor dem Doppelpunkt links unten in -der Statuszeile erkennen, dass Sie Latin-1 aktiviert haben. Beachten -Sie allerdings, dass set-language-environment keinen Einfluss auf die -Kodierung bereits existierender Puffer hat! Haben Sie eine Datei mit -deutschem Text in Latin-1-Kodierung irrtmlicherweise in einer -falschen Kodierung geladen, dann mssen Sie diesen Puffer aus Emacs -mit dem Befehl C-x k (kill-buffer) entfernen und die Datei erneut -laden, nachdem Sie mit set-language-environment auf Latin-1 -umgeschaltet haben. +Die Standard-Zeichenstze fr Deutsch sind Latin-1 (auch bekannt unter +dem Namen ISO-8859-1) und Unicode -- und da besonders dessen +Kodierungsvariante UTF-8. Werden anstelle der deutschen Umlaute +unansehnliche Konstrukte wie \374 dargestellt, hat Emacs die +Kodierung nicht richtig erkannt. Sie knnen die Anwendung einer +Kodierung auf einen Befehl erzwingen, indem Sie diesen mit der Sequenz +C-x c KODIERUNG einleiten. Das Laden einer Datei foo mit +der Kodierung UTF-8 ist beispielsweise + + C-x c utf-8 C-x C-f foo + +Ist die Sprachumgebung (locale) Ihres Betriebssystems korrekt auf +Deutsch gesetzt, verwendet Emacs diese Einstellungen automatisch +(inklusive einer Standard-Kodierung). Wollen Sie andere Einstellungen +verwenden, geben Sie C-x l ein (ein Tastenkrzel fr die +Funktion set-language-environment). Mittels + + C-x l latin-1 + +knnen Sie z.B. in einer laufenden Emacs-Sitzung auf Latin-1 +umzuschalten. Dadurch wird erreicht, dass Emacs beim Laden einer +Datei (und Speichern derselben) standardmig die +Latin-1-Zeichenkodierung verwendet. Sie knnen an der Ziffer 1 +unmittelbar vor dem Doppelpunkt links unten in der Statuszeile +erkennen, dass Sie Latin-1 aktiviert haben. Beachten Sie allerdings, +dass set-language-environment keinen Einfluss auf die Kodierung +bereits existierender Puffer hat! >> Fhren Sie jetzt C-x l latin-1 aus und ffnen Sie - anschlieend eine (neue) Datei mit dem Namen `bar' in einem anderen + anschlieend eine (neue) Datei mit dem Namen bar in einem anderen Fenster mittels C-x 4 C-f bar . In der Statuszeile des zweiten Fensters sehen Sie die Ziffer 1 unmittelbar vor dem Doppelpunkt. @@ -1305,10 +1282,10 @@ umgeschaltet haben. Wie knnen Sie nun deutsche Umlaute eingeben? Es gibt prinzipiell zwei unterschiedliche Flle: Sie besitzen eine deutsche Tastatur mit Tasten fr die Umlaute oder Sie haben eine nicht-deutsche Tastatur. -Im ersteren Fall sollten Sie die Eingabemethode `german' auswhlen, +Im ersteren Fall sollten Sie die Eingabemethode german auswhlen, welche direkt die Umlaute auf die entsprechenden Tasten abbildet. Im letzteren Fall gibt es mehrere Mglichkeiten, wovon zwei hier erklrt -werden sollen, nmlich `latin-1-prefix' und `latin-1-postfix'. Die +werden sollen, nmlich latin-1-prefix und latin-1-postfix. Die Prfix-Methode erwartet zuerst den Akzent und dann den Basisbuchstaben ('a wird zu , "s zu etc.), whrend bei der Postfix-Methode zuerst der Basisbuchstabe und dann der Akzent einzugeben ist (a" wird zu , @@ -1326,8 +1303,8 @@ angezeigt. Ist der Eingabemodus einmal gew ein- und ausschalten. >> Geben Sie C-u C-\ latin-1-postfix ein. Beobachten Sie, - wie links unten in der Statuszeile die Anzeige von `1:**' auf - `1<1:**' springt. Probieren Sie einzugeben mittels a". + wie links unten in der Statuszeile die Anzeige von 1:**- auf + 1<1:**- springt. Probieren Sie einzugeben mittels a". >> Deaktivieren Sie den Eingabemodus wieder mit C-\. @@ -1338,9 +1315,9 @@ beschriebenen Eingabemethoden: 1< latin-1-postfix 1> latin-1-prefix -So bedeutet die Angabe `DE@1:**', dass Sie die Eingabemethode `german' -in einem Puffer mit Latin-1-Kodierung verwenden, und dass die Datei -bereits modifiziert wurde. +So bedeutet die Angabe DE@1:**-, dass Sie die Eingabemethode +german in einem Puffer mit Latin-1-Kodierung verwenden, und dass die +Datei bereits modifiziert wurde. [Arbeitet Emacs in einem Terminal, werden noch zwei zustzliche Spalten zwischen Eingabemethode und Pufferkodierung eingefgt, und @@ -1356,7 +1333,7 @@ jedoch so m sprnge, an dieser Stelle mehr zu erklren. Um Sie im weiteren Lernverlauf zu untersttzen, stellt Emacs eine Reihe von Hilfe-Funktionen zu Verfgung, die alle mit dem Prfix C-h (dem -Hilfe-Zeichen, `Help character') beginnen. +Hilfe-Zeichen, Help character) beginnen. Nach dem Drcken von C-h geben Sie ein weiteres Zeichen ein, um Emacs zu sagen, worber Sie mehr Informationen brauchen. Sollten Sie @@ -1364,11 +1341,7 @@ WIRKLICH verloren sein, geben Sie C-h ? ein, und Emacs sagt Ihnen, welche Art von Hilfe er Ihnen zu Verfgung stellen kann. Haben Sie C-h versehentlich gedrckt, knnen Sie mit C-g sofort abbrechen. -(Es kann vorkommen, dass bei manchen Computern bzw. Terminals C-h -etwas anderes bedeutet. Da erfahrungsgem C-h eine der -meistbentigten Emacs-Befehle ist, haben Sie einen wirklichen Grund, -sich in diesem Fall beim Systemadministrator zu beschweren. -Alternativen zu C-h sind die F1-Taste und der lange Befehl M-x help +(Alternativen zu C-h sind die F1-Taste und der lange Befehl M-x help .) Die elementarste Hilfestellung gibt C-h c. Drcken Sie C-h, dann das @@ -1380,11 +1353,10 @@ Beschreibung des Befehls an. C-p runs the command previous-line -Somit wissen Sie den `Namen der Funktion'. Funktionsnamen werden -hauptschlich benutzt, um Emacs anzupassen bzw. zu erweitern. Aber da -Namen in der Regel beschreiben, was die jeweilige Funktion tut, knnen -sie auch als sehr kurze Beschreibung dienen -- ausreichend, um Sie an -Befehle zu erinnern, die Sie bereits gelernt haben. +Somit wissen Sie den Namen der Funktion. Da Namen in der Regel +beschreiben, was die jeweilige Funktion tut, knnen sie auch als sehr +kurze Beschreibung dienen -- ausreichend, um Sie an Befehle zu +erinnern, die Sie bereits gelernt haben. Aus mehr als einem Zeichen bestehende Befehle, z.B. C-x C-s oder v, sind ebenfalls erlaubt nach C-h c. @@ -1406,20 +1378,20 @@ Hier einige weitere n C-h f Beschreibt eine Funktion. Sie mssen den Namen der Funktion eingeben. ->> Probieren Sie C-h f previous-line. +>> Probieren Sie C-h f previous-line . Alle Information ber den C-p-Befehl wird angezeigt. Sie knnen die Tabulator-Taste stets bentzen, um den Namen des -jeweiligen Befehls zu vervollstndigen. Geben Sie z.B. `C-h f -previous' ein, dann werden alle Befehle angezeigt, deren Namen -mit `previous-' beginnen. Ergnzen Sie die Zeichenkette auf -`previous-l' und drcken Sie dann , bleibt nur noch der Befehl -`previous-line' brig, und Sie knnen mit abschlieen. +jeweiligen Befehls zu vervollstndigen. Geben Sie z.B. C-h f +previous ein, dann werden alle Befehle angezeigt, deren Namen +mit previous- beginnen. Ergnzen Sie die Zeichenkette auf +previous-l und drcken Sie dann , bleibt nur noch der Befehl +previous-line brig, und Sie knnen mit abschlieen. Ein hnlicher Befehl ist C-h v. Er zeigt den Wert und die -Dokumentation von Variablen, deren Werte man ndern kann (um Emacs an -persnliche Bedrfnisse anzupassen). Auch hier kann man die -Tabulator-Taste zur Vervollstndigung benutzen. +Dokumentation von Variablen, deren Werte man ndern kann (um +beispielsweise Emacs an persnliche Bedrfnisse anzupassen). Auch +hier kann man die Tabulator-Taste zur Vervollstndigung benutzen. C-h a Ein Befehls-Apropos. Gibt man ein Schlsselwort ein, zeigt Emacs alle Befehle, die dieses Schlsselwort @@ -1429,9 +1401,9 @@ Tabulator-Taste zur Vervollst einem oder zwei Zeichen) aufgelistet, welche den gleichen Befehl startet. ->> Geben Sie C-h a file ein. +>> Geben Sie C-h a file ein. -Alle M-x-Befehle, die das Wort `file' in ihrem Namen enthalten, werden +Alle M-x-Befehle, die das Wort file in ihrem Namen enthalten, werden angezeigt. Beachten Sie, dass auch C-x C-f aufgelistet wird neben dem zugehrigen langen Namen, find-file. @@ -1440,30 +1412,26 @@ zugeh >> Schlieen Sie das Hilfefenster mit C-x 1. C-h i Dieser Befehl ffnet einen speziellen Puffer, um - Online-Handbcher zu lesen (im `Info'-Format), die auf - dem verwendeten Computersystem installiert sind. - Geben Sie z.B. m emacs ein, um das - Emacs-Handbuch zu lesen. Haben Sie `Info' noch nie - benutzt, tippen Sie ?, und Emacs fhrt Sie Schritt fr - Schritt durch die Mglichkeiten des Info-Modus. Wenn - Sie diese Einfhrung fertiggelesen haben, sollten Sie - das Info-Handbuch fr Emacs als primre Dokumentation + Handbcher zu lesen (im Info-Format), die auf dem + verwendeten Computersystem installiert sind. Geben + Sie z.B. m emacs ein, um das Emacs-Handbuch + zu lesen. Haben Sie Info noch nie benutzt, tippen + Sie ?, und Emacs fhrt Sie Schritt fr Schritt durch + die Mglichkeiten des Info-Modus. Wenn Sie diese + Einfhrung fertiggelesen haben, sollten Sie das + Info-Handbuch fr Emacs als primre Dokumentation benutzen. * SCHLUSSBEMERKUNG ------------------ -Das Wichtigste: Emacs wird mit C-x C-c beendet und mit C-z temporr -unterbrochen. +Das Wichtigste: Emacs wird mit C-x C-c beendet. Diese Einfhrung soll fr alle neuen Benutzer von Emacs verstndlich sein. Wenn daher etwas unklar sein sollte, hadern Sie nicht mit sich -selbst. Schreiben Sie an die Free Software Foundation oder an den -Autor und erlutern Sie, was fr Sie unklar geblieben ist. Eine -weitere Kontaktadresse ist die Mailing-Liste `de@li.org', in der -Probleme mit der Adaption von GNU-Programmen an das Deutsche -diskutiert werden. +selbst. Schreiben Sie an die Free Software Foundation, den Autor oder +den bersetzer und erlutern Sie, was fr Sie unklar geblieben ist. * RECHTLICHES -- cgit v1.2.1 From 9657183b6f79dceb468bf70ce0980788dc3f0da7 Mon Sep 17 00:00:00 2001 From: Alan Mackenzie Date: Wed, 18 Jan 2012 13:19:31 +0000 Subject: Eliminate sluggishness and hangs in fontification of "semicolon deserts". cc-engine.el (c-state-nonlit-pos-interval): change value 10000 -> 3000. (c-state-safe-place): Reformulate so it doesn't stack up an infinite number of wrong entries in c-state-nonlit-pos-cache. (c-determine-limit-get-base, c-determine-limit): New functions to determine backward search limits disregarding literals. (c-find-decl-spots): Amend commenting. (c-cheap-inside-bracelist-p): New function which detects "={". cc-fonts.el (c-make-font-lock-BO-decl-search-function): Give a limit to a backward search. (c-font-lock-declarations): Fix an occurrence of point being undefined. Check additionally for point being in a bracelist or near a macro invocation without a semicolon so as to avoid a fruitless time consuming search for a declarator. Give a more precise search limit for declarators using the new c-determine-limit. --- lisp/progmodes/cc-engine.el | 143 ++++++++++++++++++++++++++++++++++++++------ lisp/progmodes/cc-fonts.el | 48 +++++++++++++-- 2 files changed, 168 insertions(+), 23 deletions(-) diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el index 2e0294341da..25344fe96a7 100644 --- a/lisp/progmodes/cc-engine.el +++ b/lisp/progmodes/cc-engine.el @@ -2074,7 +2074,7 @@ comment at the start of cc-engine.el for more info." ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; We maintain a simple cache of positions which aren't in a literal, so as to ;; speed up testing for non-literality. -(defconst c-state-nonlit-pos-interval 10000) +(defconst c-state-nonlit-pos-interval 3000) ;; The approximate interval between entries in `c-state-nonlit-pos-cache'. (defvar c-state-nonlit-pos-cache nil) @@ -2129,7 +2129,7 @@ comment at the start of cc-engine.el for more info." (widen) (save-excursion (let ((c c-state-nonlit-pos-cache) - pos npos lit) + pos npos lit macro-beg) ;; Trim the cache to take account of buffer changes. (while (and c (> (car c) c-state-nonlit-pos-cache-limit)) (setq c (cdr c))) @@ -2139,16 +2139,32 @@ comment at the start of cc-engine.el for more info." (setq c (cdr c))) (setq pos (or (car c) (point-min))) - (while (<= (setq npos (+ pos c-state-nonlit-pos-interval)) - here) - (setq lit (car (cddr (c-state-pp-to-literal pos npos)))) - (setq pos (or (cdr lit) npos)) ; end of literal containing npos. + (while + ;; Add an element to `c-state-nonlit-pos-cache' each iteration. + (and + (<= (setq npos (+ pos c-state-nonlit-pos-interval)) here) + (progn + (setq lit (car (cddr (c-state-pp-to-literal pos npos)))) + (cond + ((null lit) + (setq pos npos) + t) + ((<= (cdr lit) here) + (setq pos (cdr lit)) + t) + (t + (setq pos (car lit)) + nil)))) + (goto-char pos) (when (and (c-beginning-of-macro) (/= (point) pos)) - (c-syntactic-end-of-macro) - (or (eobp) (forward-char)) - (setq pos (point))) - (setq c-state-nonlit-pos-cache (cons pos c-state-nonlit-pos-cache))) + (setq macro-beg (point)) + (c-syntactic-end-of-macro) + (or (eobp) (forward-char)) + (setq pos (if (<= (point) here) + (point) + macro-beg))) + (setq c-state-nonlit-pos-cache (cons pos c-state-nonlit-pos-cache))) (if (> pos c-state-nonlit-pos-cache-limit) (setq c-state-nonlit-pos-cache-limit pos)) @@ -4351,6 +4367,78 @@ comment at the start of cc-engine.el for more info." (t 'c))) ; Assuming the range is valid. range)) +(defsubst c-determine-limit-get-base (start try-size) + ;; Get a "safe place" approximately TRY-SIZE characters before START. + ;; This doesn't preserve point. + (let* ((pos (max (- start try-size) (point-min))) + (base (c-state-safe-place pos)) + (s (parse-partial-sexp base pos))) + (if (or (nth 4 s) (nth 3 s)) ; comment or string + (nth 8 s) + (point)))) + +(defun c-determine-limit (how-far-back &optional start try-size) + ;; Return a buffer position HOW-FAR-BACK non-literal characters from START + ;; (default point). This is done by going back further in the buffer then + ;; searching forward for literals. The position found won't be in a + ;; literal. We start searching for the sought position TRY-SIZE (default + ;; twice HOW-FAR-BACK) bytes back from START. This function must be fast. + ;; :-) + (save-excursion + (let* ((start (or start (point))) + (try-size (or try-size (* 2 how-far-back))) + (base (c-determine-limit-get-base start try-size)) + (pos base) + + (s (parse-partial-sexp pos pos)) ; null state. + stack elt size + (count 0)) + (while (< pos start) + ;; Move forward one literal each time round this loop. + ;; Move forward to the start of a comment or string. + (setq s (parse-partial-sexp + pos + start + nil ; target-depth + nil ; stop-before + s ; state + 'syntax-table)) ; stop-comment + + ;; Gather details of the non-literal-bit - starting pos and size. + (setq size (- (if (or (nth 4 s) (nth 3 s)) + (nth 8 s) + (point)) + pos)) + (if (> size 0) + (setq stack (cons (cons pos size) stack))) + + ;; Move forward to the end of the comment/string. + (if (or (nth 4 s) (nth 3 s)) + (setq s (parse-partial-sexp + (point) + start + nil ; target-depth + nil ; stop-before + s ; state + 'syntax-table))) ; stop-comment + (setq pos (point))) + + ;; Now try and find enough non-literal characters recorded on the stack. + ;; Go back one recorded literal each time round this loop. + (while (and (< count how-far-back) + stack) + (setq elt (car stack) + stack (cdr stack)) + (setq count (+ count (cdr elt)))) + + ;; Have we found enough yet? + (cond + ((>= count how-far-back) + (+ (car elt) (- count how-far-back))) + ((eq base (point-min)) + (point-min)) + (t + (c-determine-limit (- how-far-back count) base try-size)))))) ;; `c-find-decl-spots' and accompanying stuff. @@ -4487,13 +4575,14 @@ comment at the start of cc-engine.el for more info." ;; Call CFD-FUN for each possible spot for a declaration, cast or ;; label from the point to CFD-LIMIT. ;; - ;; CFD-FUN is called with point at the start of the spot. It's - ;; passed two arguments: The first is the end position of the token - ;; preceding the spot, or 0 for the implicit match at bob. The - ;; second is a flag that is t when the match is inside a macro. If - ;; CFD-FUN adds `c-decl-end' properties somewhere below the current - ;; spot, it should return non-nil to ensure that the next search - ;; will find them. + ;; CFD-FUN is called with point at the start of the spot. It's passed two + ;; arguments: The first is the end position of the token preceding the spot, + ;; or 0 for the implicit match at bob. The second is a flag that is t when + ;; the match is inside a macro. Point should be moved forward by at least + ;; one token. + ;; + ;; If CFD-FUN adds `c-decl-end' properties somewhere below the current spot, + ;; it should return non-nil to ensure that the next search will find them. ;; ;; Such a spot is: ;; o The first token after bob. @@ -4867,7 +4956,8 @@ comment at the start of cc-engine.el for more info." (goto-char cfd-continue-pos) (if (= cfd-continue-pos cfd-limit) (setq cfd-match-pos cfd-limit) - (c-find-decl-prefix-search))))) + (c-find-decl-prefix-search))))) ; Moves point, sets cfd-continue-pos, + ; cfd-match-pos, etc. ;; A cache for found types. @@ -8047,6 +8137,23 @@ comment at the start of cc-engine.el for more info." next-open-brace (c-pull-open-brace paren-state))) open-brace)) +(defun c-cheap-inside-bracelist-p (paren-state) + ;; Return the position of the L-brace if point is inside a brace list + ;; initialization of an array, etc. This is an approximate function, + ;; designed for speed over accuracy. It will not find every bracelist, but + ;; a non-nil result is reliable. We simply search for "= {" (naturally with + ;; syntactic whitespace allowed). PAREN-STATE is the normal thing that it + ;; is everywhere else. + (let (b-pos) + (save-excursion + (while + (and (setq b-pos (c-pull-open-brace paren-state)) + (progn (goto-char b-pos) + (c-backward-sws) + (c-backward-token-2) + (not (looking-at "="))))) + b-pos))) + (defun c-inside-bracelist-p (containing-sexp paren-state) ;; return the buffer position of the beginning of the brace list ;; statement if we're inside a brace list, otherwise return nil. diff --git a/lisp/progmodes/cc-fonts.el b/lisp/progmodes/cc-fonts.el index e7d00815708..2d116e1ecdc 100644 --- a/lisp/progmodes/cc-fonts.el +++ b/lisp/progmodes/cc-fonts.el @@ -446,10 +446,12 @@ ;; `parse-sexp-lookup-properties' (when it exists). (parse-sexp-lookup-properties (cc-eval-when-compile - (boundp 'parse-sexp-lookup-properties)))) + (boundp 'parse-sexp-lookup-properties))) + (BOD-limit + (c-determine-limit 1000))) (goto-char (let ((here (point))) - (if (eq (car (c-beginning-of-decl-1)) 'same) + (if (eq (car (c-beginning-of-decl-1 BOD-limit)) 'same) (point) here))) ,(c-make-font-lock-search-form regexp highlights)) @@ -1240,6 +1242,7 @@ casts and declarations are fontified. Used on level 2 and higher." ;; it finds any. That's necessary so that we later will ;; stop inside them to fontify types there. (c-parse-and-markup-<>-arglists t) + lbrace ; position of some {. ;; The font-lock package in Emacs is known to clobber ;; `parse-sexp-lookup-properties' (when it exists). (parse-sexp-lookup-properties @@ -1351,7 +1354,6 @@ casts and declarations are fontified. Used on level 2 and higher." (or (looking-at c-typedef-key) (goto-char start-pos))) - ;; Now analyze the construct. ;; In QT, "more" is an irritating keyword that expands to nothing. ;; We skip over it to prevent recognition of "more slots: " ;; as a bitfield declaration. @@ -1360,6 +1362,8 @@ casts and declarations are fontified. Used on level 2 and higher." (concat "\\(more\\)\\([^" c-symbol-chars "]\\|$\\)"))) (goto-char (match-end 1)) (c-forward-syntactic-ws)) + + ;; Now analyze the construct. (setq decl-or-cast (c-forward-decl-or-cast-1 match-pos context last-cast-end)) @@ -1428,6 +1432,39 @@ casts and declarations are fontified. Used on level 2 and higher." (c-fontify-recorded-types-and-refs) nil) + ;; Restore point, since at this point in the code it has been + ;; left undefined by c-forward-decl-or-cast-1 above. + ((progn (goto-char start-pos) nil)) + + ;; If point is inside a bracelist, there's no point checking it + ;; being at a declarator. + ((let ((paren-state (c-parse-state))) + (setq lbrace (c-cheap-inside-bracelist-p paren-state))) + ;; Move past this bracelist to prevent an endless loop. + (goto-char lbrace) + (unless (c-safe (progn (forward-list) t)) + (goto-char start-pos) + (c-forward-token-2)) + nil) + + ;; If point is just after a ")" which is followed by an + ;; identifier which isn't a label, or at the matching "(", we're + ;; at either a macro invocation, a cast, or a + ;; for/while/etc. statement. The cast case is handled above. + ;; None of these cases can contain a declarator. + ((or (and (eq (char-before match-pos) ?\)) + (c-on-identifier) + (save-excursion (not (c-forward-label)))) + (and (eq (char-after) ?\() + (save-excursion + (and + (progn (c-backward-token-2) (c-on-identifier)) + (save-excursion (not (c-forward-label))) + (progn (c-backward-token-2) + (eq (char-after) ?\()))))) + (c-forward-token-2) ; Must prevent looping. + nil) + ((and (not c-enums-contain-decls) ;; An optimization quickly to eliminate scans of long enum ;; declarations in the next cond arm. @@ -1441,13 +1478,14 @@ casts and declarations are fontified. Used on level 2 and higher." (progn (c-backward-token-2) (looking-at c-brace-list-key))))))) - t) + (c-forward-token-2) + nil) (t ;; Are we at a declarator? Try to go back to the declaration ;; to check this. If we get there, check whether a "typedef" ;; is there, then fontify the declarators accordingly. - (let ((decl-search-lim (max (- (point) 50000) (point-min))) + (let ((decl-search-lim (c-determine-limit 1000)) paren-state bod-res encl-pos is-typedef c-recognize-knr-p) ; Strictly speaking, bogus, but it ; speeds up lisp.h tremendously. -- cgit v1.2.1 From 606c44c4cfea818143b9007754331dcf4fa06561 Mon Sep 17 00:00:00 2001 From: Alan Mackenzie Date: Wed, 18 Jan 2012 13:39:32 +0000 Subject: Update ChangeLog. --- lisp/ChangeLog | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 6ada090d071..0fea6a47b08 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,27 @@ +2012-01-18 Alan Mackenzie + + Eliminate sluggishness and hangs in fontification of "semicolon + deserts". + + * progmodes/cc-engine.el (c-state-nonlit-pos-interval): change + value 10000 -> 3000. + (c-state-safe-place): Reformulate so it doesn't stack up an + infinite number of wrong entries in c-state-nonlit-pos-cache. + (c-determine-limit-get-base, c-determine-limit): New functions to + determine backward search limits disregarding literals. + (c-find-decl-spots): Amend commenting. + (c-cheap-inside-bracelist-p): New function which detects "={". + + * progmodes/cc-fonts.el + (c-make-font-lock-BO-decl-search-function): Give a limit to a + backward search. + (c-font-lock-declarations): Fix an occurrence of point being + undefined. Check additionally for point being in a bracelist or + near a macro invocation without a semicolon so as to avoid a + fruitless time consuming search for a declarator. Give a more + precise search limit for declarators using the new + c-determine-limit. + 2012-01-18 Glenn Morris * files.el (auto-mode-alist, inhibit-first-line-modes-regexps) -- cgit v1.2.1 From c3fae8e7fad0b8f7b4f4ddbf54ecda182476313d Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Wed, 18 Jan 2012 22:58:01 +0800 Subject: Reorganize Emacs 23.4 NEWS. --- etc/NEWS | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/etc/NEWS b/etc/NEWS index 4934468d018..136bdf1b3f6 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -15,6 +15,15 @@ You can narrow news to a specific version by calling `view-emacs-news' with a prefix argument or by typing C-u C-h C-n. +* Installation Changes in Emacs 23.4 + +** The MS-Windows build prefers libpng version 1.14 or later. +Versions of libpng before 1.14 had security issues, so we now +recommend to use version 1.14 or later. Precompiled Windows binaries +require version 1.14 or later. See README.W32 and nt/INSTALL for +details and pointers to URLs where the latest libpng can be +downloaded. + * Changes in Specialized Modes and Packages in Emacs 23.4 ** EDE @@ -26,22 +35,11 @@ variable. This reduces the risk of inadvertently loading malicious project files. The commands `M-x ede-new' and `M-x ede' now offer to save directories to `ede-project-directories'. - -* Installation Changes in Emacs 23.4 - -** The MS-Windows build prefers libpng version 1.14 or later. -Versions of libpng before 1.14 had security issues, so we now -recommend to use version 1.14 or later. Precompiled Windows binaries -require version 1.14 or later. See README.W32 and nt/INSTALL for -details and pointers to URLs where the latest libpng can be -downloaded. - - * Changes in Emacs 23.4 on non-free operating systems ** The MS-Windows port can now use more than 500MB of heap. Depending on the available virtual memory, Emacs on Windows can now -have up to 2GB of heap space. This allows, e.g., to visit several +have up to 2GB of heap space. This allows, e.g., visiting several large (> 256MB) files in the same session. -- cgit v1.2.1 From 893d44a1693a196f3022492f66c0205b7ccbeb47 Mon Sep 17 00:00:00 2001 From: Yoshiaki Kasahara Date: Wed, 18 Jan 2012 23:01:35 +0800 Subject: Fix init_buffer for USE_MMAP_FOR_BUFFERS case (backport from trunk) * buffer.c (init_buffer) [USE_MMAP_FOR_BUFFERS]: Adjust to aliasing change. --- src/ChangeLog | 5 +++++ src/buffer.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/ChangeLog b/src/ChangeLog index 2238c1b8bfd..18b96b04195 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2012-01-18 Yoshiaki Kasahara (tiny change) + + * buffer.c (init_buffer) [USE_MMAP_FOR_BUFFERS]: Adjust to + aliasing change. + 2012-01-15 YAMAMOTO Mitsuharu * xftfont.c (xftfont_draw): Use the font metrics of s->font to diff --git a/src/buffer.c b/src/buffer.c index 5e2fda807dc..714f764bc11 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -5338,7 +5338,7 @@ init_buffer () Map new memory. */ struct buffer *b; - for (b = all_buffers; b; b = b->next) + for (b = all_buffers; b; b = b->header.next.buffer) if (b->text->beg == NULL) enlarge_buffer_text (b, 0); } -- cgit v1.2.1 From 073938ec1dc48d21956f5b543bf5eedb37b12dfd Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Wed, 18 Jan 2012 23:11:11 +0800 Subject: Fix python-wy.el copyright header. --- lisp/cedet/semantic/wisent/python-wy.el | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lisp/cedet/semantic/wisent/python-wy.el b/lisp/cedet/semantic/wisent/python-wy.el index 1cc9902e70f..e1090ef6a20 100644 --- a/lisp/cedet/semantic/wisent/python-wy.el +++ b/lisp/cedet/semantic/wisent/python-wy.el @@ -1,7 +1,9 @@ ;;; semantic/wisent/python-wy.el --- Generated parser support file -;; Copyright (C) 2002-2011, 2012 Free Software Foundation, Inc. -;; Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Python Software Foundation; All Rights Reserved +;; Copyright (C) 2002, 2003, 2004, 2007, 2010, 2011, 2012 +;; Free Software Foundation, Inc. +;; Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, +;; 2009, 2010 Python Software Foundation; All Rights Reserved ;; This file is part of GNU Emacs. -- cgit v1.2.1 From 54de86ac6216fc2eece477308dde090381d6b6c7 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Wed, 18 Jan 2012 22:42:57 -0800 Subject: Small bzrmerge.el change. * admin/bzrmerge.el (bzrmerge-missing): Allow a definitive "no" answer to the "skip?" question, since there can be multiple such for any revision. --- admin/ChangeLog | 5 +++++ admin/bzrmerge.el | 20 +++++++++++++++++--- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/admin/ChangeLog b/admin/ChangeLog index 597beb60ce2..2178df6caf0 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog @@ -1,3 +1,8 @@ +2012-01-19 Glenn Morris + + * bzrmerge.el (bzrmerge-missing): Allow a definitive "no" answer to the + "skip?" question, since there can be multiple such for any revision. + 2012-01-14 Eli Zaretskii * FOR-RELEASE (Check the Emacs Tutorial): Mark TUTORIAL.he as diff --git a/admin/bzrmerge.el b/admin/bzrmerge.el index 2efb17603cd..cb63d5b16ba 100644 --- a/admin/bzrmerge.el +++ b/admin/bzrmerge.el @@ -133,9 +133,23 @@ are both lists of revnos, in oldest-first order." (setq str (substring str (match-end 0)))) (when (string-match "[.!;, ]+\\'" str) (setq str (substring str 0 (match-beginning 0)))) - (if (save-excursion (y-or-n-p (concat str ": Skip? "))) - (setq skip t)))) - (if skip + (let ((help-form "\ +Type `y' to skip this revision, +`N' to include it and go on to the next revision, +`n' to not skip, but continue to search this log entry for skip regexps, +`q' to quit merging.")) + (case (save-excursion + (read-char-choice + (format "%s: Skip (y/n/N/q/%s)? " str + (key-description (vector help-char))) + '(?y ?n ?N ?q))) + (?y (setq skip t)) + (?q (keyboard-quit)) + ;; A single log entry can match skip-regexp multiple + ;; times. If you are sure you don't want to skip it, + ;; you don't want to be asked multiple times. + (?N (setq skip 'no)))))) + (if (eq skip t) (push revno skipped) (push revno revnos))))) (delete-region (point) (point-max))) -- cgit v1.2.1 From 110544dea07071e88b8970cf024cb862b0870b41 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Wed, 18 Jan 2012 23:03:15 -0800 Subject: Revert unintentional addition of 2012 to Ecma copyright years. This was done by mistake in emacs-23 2010-06-25T08:19:11Z!agustin.martin@hispalinux.es, and then propagated to one more file in 2010-06-26T12:01:31Z!eliz@gnu.org. --- etc/grammars/js.wy | 2 +- etc/grammars/wisent-grammar.el | 2 +- lisp/cedet/semantic/wisent/js-wy.el | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/etc/grammars/js.wy b/etc/grammars/js.wy index b0edcb50382..56591943b22 100644 --- a/etc/grammars/js.wy +++ b/etc/grammars/js.wy @@ -1,7 +1,7 @@ ;;; javascript-jv.wy -- LALR grammar for Javascript ;; Copyright (C) 2005-2011, 2012 Free Software Foundation, Inc. -;; Copyright (C) 1998-2011, 2012 Ecma International. +;; Copyright (C) 1998-2011 Ecma International. ;; Author: Joakim Verona diff --git a/etc/grammars/wisent-grammar.el b/etc/grammars/wisent-grammar.el index 59d58c28325..77fdfddc5bf 100644 --- a/etc/grammars/wisent-grammar.el +++ b/etc/grammars/wisent-grammar.el @@ -471,7 +471,7 @@ Menu items are appended to the common grammar menu.") "srecode/srt-wy") ("wisent-javascript-jv-wy.el" "semantic/wisent/js-wy" - "Copyright (C) 1998-2011, 2012 Ecma International." + "Copyright (C) 1998-2011 Ecma International." ,wisent-make-parsers--ecmascript-license) ("wisent-java-tags-wy.el" "semantic/wisent/javat-wy") diff --git a/lisp/cedet/semantic/wisent/js-wy.el b/lisp/cedet/semantic/wisent/js-wy.el index 19c69ecb51b..1862de2d838 100644 --- a/lisp/cedet/semantic/wisent/js-wy.el +++ b/lisp/cedet/semantic/wisent/js-wy.el @@ -1,7 +1,7 @@ ;;; semantic/wisent/js-wy.el --- Generated parser support file ;; Copyright (C) 2005, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. -;; Copyright (C) 1998-2012 Ecma International. +;; Copyright (C) 1998-2011 Ecma International. ;; This file is part of GNU Emacs. -- cgit v1.2.1 From 685305ebe0455a8d5211bedf41b588bccfb432c8 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Wed, 18 Jan 2012 23:15:48 -0800 Subject: Copy copyright fix from 2010-06-26T12:01:31Z!eliz@gnu.org to one more file. --- etc/grammars/python.wy | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/etc/grammars/python.wy b/etc/grammars/python.wy index e632cefc660..4b288dcb9a2 100644 --- a/etc/grammars/python.wy +++ b/etc/grammars/python.wy @@ -1,7 +1,8 @@ ;;; python.wy -- LALR grammar for Python ;; Copyright (C) 2002-2011, 2012 Free Software Foundation, Inc. -;; Copyright (C) 2001-2010 Python Software Foundation +;; Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, +;; 2009, 2010 Python Software Foundation; All Rights Reserved ;; Author: Richard Kim ;; Maintainer: Richard Kim -- cgit v1.2.1 From 34a02f46dce0136ef10deb0f632330c76babbd9c Mon Sep 17 00:00:00 2001 From: Martin Rudalics Date: Thu, 19 Jan 2012 11:38:31 +0100 Subject: Fix handling of persistent window parameters. * window.c (save_window_save, Fcurrent_window_configuration) (Vwindow_persistent_parameters): Do not use Qstate. Rewrite doc-strings. * window.el (window--state-get-1, window-state-get): Do not use special state value for window-persistent-parameters. Rename argument IGNORE to WRITABLE. Rewrite doc-string. (window--state-put-2): Reset all window parameters to nil before assigning values of persistent parameters. * windows.texi (Window Configurations): Rewrite references to persistent window parameters. (Window Parameters): Fix description of persistent window parameters. --- doc/lispref/ChangeLog | 7 +++++ doc/lispref/windows.texi | 57 +++++++++++++++-------------------- lisp/ChangeLog | 8 +++++ lisp/window.el | 78 ++++++++++++++++++++++-------------------------- src/ChangeLog | 6 ++++ src/window.c | 36 +++++++++++----------- 6 files changed, 99 insertions(+), 93 deletions(-) diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index 4b9531c0e6c..44467d5f51b 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -1,3 +1,10 @@ +2012-01-19 Martin Rudalics + + * windows.texi (Window Configurations): Rewrite references to + persistent window parameters. + (Window Parameters): Fix description of persistent window + parameters. + 2012-01-16 Juanma Barranquero * windows.texi (Window Parameters): Use @pxref. diff --git a/doc/lispref/windows.texi b/doc/lispref/windows.texi index 1bff30e45e1..a0f8b61ddfe 100644 --- a/doc/lispref/windows.texi +++ b/doc/lispref/windows.texi @@ -3104,9 +3104,9 @@ window configuration; see @ref{Frame Configurations}. @defun current-window-configuration &optional frame This function returns a new object representing @var{frame}'s current window configuration. The default for @var{frame} is the selected -frame. This function saves copies of window parameters listed by the -variable @code{window-persistent-parameters}, see @ref{Window -Parameters} for details. +frame. The variable @code{window-persistent-parameters} specifies +whether and which window parameters are saved by this function, see +@ref{Window Parameters} for details. @end defun @defun set-window-configuration configuration @@ -3214,27 +3214,25 @@ to clone the state of a frame into an arbitrary live window (@code{set-window-configuration} effectively clones the windows of a frame into the root window of that very frame only). -@defun window-state-get &optional window ignore +@defun window-state-get &optional window writable This function returns the state of @var{window} as a Lisp object. The argument @var{window} can be any window and defaults to the root window of the selected frame. -If the optional argument @var{ignore} is non-@code{nil}, this means to +If the optional argument @var{writable} is non-@code{nil}, this means to not use markers for sampling positions like @code{window-point} or @code{window-start}. This argument should be non-@code{nil} when the -state shall be written on disk and read back in another session. +state shall be written to disk and read back in another session. -The variable @code{window-persistent-parameters} specifies whether and -which window parameters are saved by this function, see @ref{Window -Parameters} for details. +Together, the argument @var{writable} and the variable +@code{window-persistent-parameters} specify which window parameters are +saved by this function, see @ref{Window Parameters} for details. @end defun -The value returned by @code{window-state-get} can be converted, using -one of the functions defined by Desktop Save Mode (@pxref{Desktop Save -Mode}), to an object that can be written to a file. Such objects can be -read back and converted to a Lisp object representing the state of the -window. That Lisp object can be used as argument for the following -function in order to restore the state window in another window. +The value returned by @code{window-state-get} can be used in the same +session to make a clone of a window in another window. It can be also +written to disk and read back in another session. In either case, use +the function described next to restore the state of the window. @defun window-state-put state &optional window ignore This function puts the window state @var{state} into @var{window}. The @@ -3281,10 +3279,10 @@ states of windows (@pxref{Window Configurations}) do not care about window parameters. This means, that when you change the value of a parameter within the body of a @code{save-window-excursion}, the previous value is not restored upon exit of that macro. It also means -that when you clone via @code{window-state-put} a window state saved -earlier by @code{window-state-get}, the cloned windows come up with no -parameters at all. The following variable allows to override the -standard behavior. +that when you restore via @code{window-state-put} a window state saved +earlier by @code{window-state-get}, all cloned windows have their +parameters reset to @code{nil}. The following variable allows to +override the standard behavior. @defvar window-persistent-parameters This variable is an alist specifying which parameters get saved by @@ -3293,32 +3291,25 @@ subsequently restored by @code{set-window-configuration} and @code{window-state-put}, see @ref{Window Configurations}. The @sc{car} of each entry of this alist is the symbol specifying the -parameter. The @sc{cdr} must be one of the following: +parameter. The @sc{cdr} should be one of the following: @table @asis -@item @code{state} -This value means the parameter is saved by @code{window-state-get} -provided its @var{ignore} argument is @code{nil}. The function -@code{current-window-configuration} does not save this parameter. - @item @code{nil} +This value means the parameter is neither saved by +@code{window-state-get} nor by @code{current-window-configuration}. + +@item @code{t} This value specifies that the parameter is saved by -@code{current-window-configuration} and, provided its @var{ignore} +@code{current-window-configuration} and, provided its @var{writable} argument is @code{nil}, by @code{window-state-get}. -@item @code{t} +@item @code{writable} This means that the parameter is saved unconditionally by both @code{current-window-configuration} and @code{window-state-get}. This value should not be used for parameters whose values do not have a read syntax. Otherwise, invoking @code{window-state-put} in another session may fail with an @code{invalid-read-syntax} error. @end table - -Parameters that have been saved are restored to their previous values by -@code{set-window-configuration} respectively are installed by -@code{window-state-put}. Parameters that have not been saved are left -alone by @code{set-window-configuration} respectively are not installed -by @code{window-state-put}. @end defvar Some functions, notably @code{delete-window}, diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 0fea6a47b08..8fa8031d125 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,11 @@ +2012-01-19 Martin Rudalics + + * window.el (window--state-get-1, window-state-get): Do not use + special state value for window-persistent-parameters. Rename + argument IGNORE to WRITABLE. Rewrite doc-string. + (window--state-put-2): Reset all window parameters to nil before + assigning values of persistent parameters. + 2012-01-18 Alan Mackenzie Eliminate sluggishness and hangs in fontification of "semicolon diff --git a/lisp/window.el b/lisp/window.el index 54e5ec9c74c..9122904b0bb 100644 --- a/lisp/window.el +++ b/lisp/window.el @@ -3568,7 +3568,7 @@ specific buffers." )) ;;; Window states, how to get them and how to put them in a window. -(defun window--state-get-1 (window &optional ignore) +(defun window--state-get-1 (window &optional writable) "Helper function for `window-state-get'." (let* ((type (cond @@ -3585,29 +3585,22 @@ specific buffers." (normal-height . ,(window-normal-size window)) (normal-width . ,(window-normal-size window t)) (combination-limit . ,(window-combination-limit window)) - ,@(let (list) - ;; Make copies of persistent window parameters whose cdr - ;; is either t or, when IGNORE is non-nil, is either nil - ;; or `state'. - (dolist (pers window-persistent-parameters) - (when (and (consp pers) - (or (eq (cdr pers) t) - (and (memq (cdr pers) '(state nil)) - (not ignore)))) - (let ((par (assq (car pers) (window-parameters window)))) - (setq list (cons (cons (car pers) (when par (cdr par))) - list))))) - ;; Save `clone-of' parameter unless IGNORE or - ;; `window-persistent-parameters' prevail. - (when (and (not (assq 'clone-of (window-parameters window))) - (let ((clone-of - (assq 'clone-of - window-persistent-parameters))) - (when clone-of - (if ignore - (eq (cdr clone-of) t) - (memq (cdr clone-of) '(state nil)))))) - (setq list (cons (cons 'clone-of window) list))) + ,@(let ((parameters (window-parameters window)) + list) + ;; Make copies of those window parameters whose + ;; persistence property is `writable' if WRITABLE is + ;; non-nil and non-nil if WRITABLE is nil. + (dolist (par parameters) + (let ((pers (cdr (assq (car par) + window-persistent-parameters)))) + (when (and pers (or (not writable) (eq pers 'writable))) + (setq list (cons (cons (car par) (cdr par)) list))))) + ;; Add `clone-of' parameter if necessary. + (let ((pers (cdr (assq 'clone-of + window-persistent-parameters)))) + (when (and pers (or (not writable) (eq pers 'writable)) + (not (assq 'clone-of list))) + (setq list (cons (cons 'clone-of window) list)))) (when list `((parameters . ,list)))) ,@(when buffer @@ -3628,31 +3621,34 @@ specific buffers." (scroll-bars . ,(window-scroll-bars window)) (vscroll . ,(window-vscroll window)) (dedicated . ,(window-dedicated-p window)) - (point . ,(if ignore point (copy-marker point))) - (start . ,(if ignore start (copy-marker start))) + (point . ,(if writable point (copy-marker point))) + (start . ,(if writable start (copy-marker start))) ,@(when mark - `((mark . ,(if ignore + `((mark . ,(if writable mark (copy-marker mark)))))))))))) (tail (when (memq type '(vc hc)) (let (list) (setq window (window-child window)) (while window - (setq list (cons (window--state-get-1 window ignore) list)) + (setq list (cons (window--state-get-1 window writable) list)) (setq window (window-right window))) (nreverse list))))) (append head tail))) -(defun window-state-get (&optional window ignore) +(defun window-state-get (&optional window writable) "Return state of WINDOW as a Lisp object. WINDOW can be any window and defaults to the root window of the selected frame. -Optional argument IGNORE non-nil means do not use markers for -sampling positions like `window-point' or `window-start' and do -not record parameters unless `window-persistent-parameters' -requests it. IGNORE should be non-nil when the return value -shall be written to a file and read back in another session. +Optional argument WRITABLE non-nil means do not use markers for +sampling `window-point' and `window-start'. Together, WRITABLE +and the variable `window-persistent-parameters' specify which +window parameters are saved by this function. WRITABLE should be +non-nil when the return value shall be written to a file and read +back in another session. Otherwise, an application may run into +an `invalid-read-syntax' error while attempting to read back the +value from file. The return value can be used as argument for `window-state-put' to put the state recorded here into an arbitrary window. The @@ -3678,7 +3674,7 @@ value can be also stored on disk and read back in a new session." ;; These are probably not needed. ,@(when (window-size-fixed-p window) `((fixed-height . t))) ,@(when (window-size-fixed-p window t) `((fixed-width . t)))) - (window--state-get-1 window ignore))) + (window--state-get-1 window writable))) (defvar window-state-put-list nil "Helper variable for `window-state-put'.") @@ -3757,15 +3753,13 @@ value can be also stored on disk and read back in a new session." (state (cdr (assq 'buffer item)))) (when combination-limit (set-window-combination-limit window combination-limit)) - ;; Assign saved window parameters. If a parameter's value is nil, - ;; don't assign it unless the new window has it set already (which - ;; shouldn't happen unless some `window-configuration-change-hook' - ;; function installed it). + ;; Reset window's parameters and assign saved ones (we might want + ;; a `remove-window-parameters' function here). + (dolist (parameter (window-parameters window)) + (set-window-parameter window (car parameter) nil)) (when parameters (dolist (parameter parameters) - (when (or (cdr parameter) - (window-parameter window (car parameter))) - (set-window-parameter window (car parameter) (cdr parameter))))) + (set-window-parameter window (car parameter) (cdr parameter)))) ;; Process buffer related state. (when state ;; We don't want to raise an error here so we create a buffer if diff --git a/src/ChangeLog b/src/ChangeLog index 3a6e31eede4..faaea4057c5 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2012-01-19 Martin Rudalics + + * window.c (save_window_save, Fcurrent_window_configuration) + (Vwindow_persistent_parameters): Do not use Qstate. Rewrite + doc-strings. + 2012-01-19 Kenichi Handa * character.c (char_width): New function. diff --git a/src/window.c b/src/window.c index 3dc6029d24d..324689498ae 100644 --- a/src/window.c +++ b/src/window.c @@ -57,7 +57,7 @@ static Lisp_Object Qreplace_buffer_in_windows, Qget_mru_window; static Lisp_Object Qwindow_resize_root_window, Qwindow_resize_root_window_vertically; static Lisp_Object Qscroll_up, Qscroll_down, Qscroll_command; static Lisp_Object Qsafe, Qabove, Qbelow; -static Lisp_Object Qauto_buffer_name, Qclone_of, Qstate; +static Lisp_Object Qauto_buffer_name, Qclone_of; static int displayed_window_lines (struct window *); static struct window *decode_window (Lisp_Object); @@ -5889,9 +5889,8 @@ save_window_save (Lisp_Object window, struct Lisp_Vector *vector, int i) tem = XCDR (tem)) { pers = XCAR (tem); - /* Save values for persistent window parameters whose cdr - is either nil or t. */ - if (CONSP (pers) && (NILP (XCDR (pers)) || EQ (XCDR (pers), Qt))) + /* Save values for persistent window parameters. */ + if (CONSP (pers) && !NILP (XCDR (pers))) { par = Fassq (XCAR (pers), w->window_parameters); if (NILP (par)) @@ -5966,7 +5965,9 @@ and for each displayed buffer, where display starts, and the positions of point and mark. An exception is made for point in the current buffer: its value is -not- saved. This also records the currently selected frame, and FRAME's focus -redirection (see `redirect-frame-focus'). */) +redirection (see `redirect-frame-focus'). The variable +`window-persistent-parameters' specifies which window parameters are +saved by this function. */) (Lisp_Object frame) { register Lisp_Object tem; @@ -6504,7 +6505,6 @@ syms_of_window (void) DEFSYM (Qbelow, "below"); DEFSYM (Qauto_buffer_name, "auto-buffer-name"); DEFSYM (Qclone_of, "clone-of"); - DEFSYM (Qstate, "state"); staticpro (&Vwindow_list); @@ -6616,28 +6616,28 @@ function `set-window-combination-limit'. */); DEFVAR_LISP ("window-persistent-parameters", Vwindow_persistent_parameters, doc: /* Alist of persistent window parameters. -Parameters in this list are saved by `current-window-configuration' and -`window-state-get' and subsequently restored to their previous values by -`set-window-configuration' and `window-state-put'. +This alist specifies which window parameters shall get saved by +`current-window-configuration' and `window-state-get' and subsequently +restored to their previous values by `set-window-configuration' and +`window-state-put'. The car of each entry of this alist is the symbol specifying the parameter. The cdr is one of the following: -The symbol `state' means the parameter is saved by `window-state-get' -provided its IGNORE argument is nil. `current-window-configuration' -does not save this parameter. +nil means the parameter is neither saved by `window-state-get' nor by +`current-window-configuration'. -nil means the parameter is saved by `current-window-configuration' and, -provided its IGNORE argument is nil, by `window-state-get'. +t means the parameter is saved by `current-window-configuration' and, +provided its WRITABLE argument is nil, by `window-state-get'. -t means the parameter is saved unconditionally by both -`current-window-configuration' and `window-state-get'. Parameters -without read syntax (like windows or frames) should not use that. +The symbol `writable' means the parameter is saved unconditionally by +both `current-window-configuration' and `window-state-get'. Do not use +this value for parameters without read syntax (like windows or frames). Parameters not saved by `current-window-configuration' or `window-state-get' are left alone by `set-window-configuration' respectively are not installed by `window-state-put'. */); - Vwindow_persistent_parameters = list1 (Fcons (Qclone_of, Qstate)); + Vwindow_persistent_parameters = list1 (Fcons (Qclone_of, Qt)); defsubr (&Sselected_window); defsubr (&Sminibuffer_window); -- cgit v1.2.1 From 1ef176814849c2c180ce80c65feb7af3ca3efa68 Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Thu, 19 Jan 2012 16:04:24 +0100 Subject: doc/lispref/emacs-lisp-intro.texi (count-words-in-defun): Fix bug#10544. --- doc/lispintro/ChangeLog | 5 +++++ doc/lispintro/emacs-lisp-intro.texi | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/doc/lispintro/ChangeLog b/doc/lispintro/ChangeLog index 30ea2be6803..2a1d018cc26 100644 --- a/doc/lispintro/ChangeLog +++ b/doc/lispintro/ChangeLog @@ -1,3 +1,8 @@ +2012-01-19 Juanma Barranquero + + * emacs-lisp-intro.texi (count-words-in-defun): + Add missing parenthesis (bug#10544). + 2012-01-17 Glenn Morris * emacs-lisp-intro.texi (re-search-forward): Fix typo. diff --git a/doc/lispintro/emacs-lisp-intro.texi b/doc/lispintro/emacs-lisp-intro.texi index be49c52ac2c..d70ff9f3b44 100644 --- a/doc/lispintro/emacs-lisp-intro.texi +++ b/doc/lispintro/emacs-lisp-intro.texi @@ -15012,7 +15012,7 @@ expression for this (@pxref{Syntax}), so the loop is straightforward: @group (while (and (< (point) end) (re-search-forward - "\\(\\w\\|\\s_\\)+[^ \t\n]*[ \t\n]*" end t) + "\\(\\w\\|\\s_\\)+[^ \t\n]*[ \t\n]*" end t)) (setq count (1+ count))) @end group @end smallexample -- cgit v1.2.1 From 0d0deb382bfc139f4c30f1f17ef1ab410ff94836 Mon Sep 17 00:00:00 2001 From: Julien Danjou Date: Thu, 19 Jan 2012 23:06:49 +0000 Subject: color.el (color-name-to-rgb): Use the white color to find the max color component value and return correctly computed values. (color-name-to-rgb): Add missing float conversion for max value. --- lisp/ChangeLog | 6 ++++++ lisp/color.el | 5 ++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 8fa8031d125..ab813e21922 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2012-01-19 Julien Danjou + + * color.el (color-name-to-rgb): Use the white color to find the max + color component value and return correctly computed values. + (color-name-to-rgb): Add missing float conversion for max value. + 2012-01-19 Martin Rudalics * window.el (window--state-get-1, window-state-get): Do not use diff --git a/lisp/color.el b/lisp/color.el index ff7f0eee4e6..6fab613ba69 100644 --- a/lisp/color.el +++ b/lisp/color.el @@ -53,7 +53,10 @@ numbers, (RED GREEN BLUE), each between 0.0 and 1.0 inclusive. Optional arg FRAME specifies the frame where the color is to be displayed. If FRAME is omitted or nil, use the selected frame. If FRAME cannot display COLOR, return nil." - (mapcar (lambda (x) (/ x 65535.0)) (color-values color frame))) + ;; `colors-values' maximum value is either 65535 or 65280 depending on the + ;; display system. So we use a white conversion to get the max value. + (let ((valmax (float (car (color-values "#ffffff"))))) + (mapcar (lambda (x) (/ x valmax)) (color-values color frame)))) (defun color-rgb-to-hex (red green blue) "Return hexadecimal notation for the color RED GREEN BLUE. -- cgit v1.2.1 From dd6e3cdd5aa93d7c5125bad0b22cce71df5f04d0 Mon Sep 17 00:00:00 2001 From: Martin Rudalics Date: Fri, 20 Jan 2012 09:12:35 +0100 Subject: In make-help-screen make original minor-mode-map-alist temporarily visible. * help-macro.el (make-help-screen): Temporarily restore original binding for minor-mode-map-alist (Bug#10454). --- lisp/ChangeLog | 5 +++++ lisp/help-macro.el | 9 ++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index ab813e21922..71211ca9af9 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2012-01-20 Martin Rudalics + + * help-macro.el (make-help-screen): Temporarily restore original + binding for minor-mode-map-alist (Bug#10454). + 2012-01-19 Julien Danjou * color.el (color-name-to-rgb): Use the white color to find the max diff --git a/lisp/help-macro.el b/lisp/help-macro.el index 0bd6f3c4798..112c72778bc 100644 --- a/lisp/help-macro.el +++ b/lisp/help-macro.el @@ -184,9 +184,12 @@ and then returns." (when config (set-window-configuration config) (setq config nil)) - ;; `defn' must make sure that its frame is - ;; selected, so we won't iconify it below. - (call-interactively defn) + ;; Temporarily rebind `minor-mode-map-alist' + ;; to `new-minor-mode-map-alist' (Bug#10454). + (let ((minor-mode-map-alist new-minor-mode-map-alist)) + ;; `defn' must make sure that its frame is + ;; selected, so we won't iconify it below. + (call-interactively defn)) (when new-frame ;; Do not iconify the selected frame. (unless (eq new-frame (selected-frame)) -- cgit v1.2.1 From 02dc2fd7cb75297953625d219e9fc94f0ecebc08 Mon Sep 17 00:00:00 2001 From: Eric Hanchrow Date: Fri, 20 Jan 2012 21:12:38 +0100 Subject: * tramp.texi (File): Tweak wording for the `scpc' option. --- doc/misc/ChangeLog | 4 ++++ doc/misc/tramp.texi | 15 ++++++++++++--- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index adb5bbbd669..9c29473e99d 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -1,3 +1,7 @@ +2012-01-19 Eric Hanchrow + + * tramp.texi (File): Tweak wording for the `scpc' option. + 2012-01-06 Lars Magne Ingebrigtsen * gnus.texi (Group Parameters): Really note precedence. diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi index 41ba6689f13..7fbd11decd7 100644 --- a/doc/misc/tramp.texi +++ b/doc/misc/tramp.texi @@ -866,13 +866,22 @@ Newer versions of @option{ssh} (for example OpenSSH 4) offer an option @option{ControlMaster}. This allows @option{scp} to reuse an existing @option{ssh} channel, which increases performance. -Before you use this method, you shall check whether your @option{ssh} -implementation does support this option. Try from the command line +Before you use this method, you should check whether your @option{ssh} +implementation supports this option. Try from the command line @example -ssh localhost -o ControlMaster=yes +ssh localhost -o ControlMaster=yes /bin/true @end example +If that command succeeds silently, then you can use @option{scpc}; but +if it fails like + +@example +command-line: line 0: Bad configuration option: ControlMaster +@end example + +then you cannot use it. + This method supports the @samp{-p} argument. -- cgit v1.2.1 From a2f0118ce5c18ea397c9571e401231b2fca7aa61 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Fri, 20 Jan 2012 16:26:00 -0800 Subject: * etc/NEWS: Relocate MS Windows change to "non-free" section. --- etc/NEWS | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/etc/NEWS b/etc/NEWS index 0b0e5e571aa..11537363ef4 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -84,10 +84,6 @@ longer have any effect. (They were declared obsolete in Emacs 23.) ** New command line option `--no-site-lisp' removes site-lisp directories from load-path. -Q now implies this. ---- -** On Windows, Emacs now warns when the obsolete _emacs init file is used, -and also when HOME is set to C:\ by default. - * Changes in Emacs 24.1 @@ -1378,6 +1374,10 @@ Use `filter-buffer-substring-functions' instead. * Changes in Emacs 24.1 on non-free operating systems +--- +** On MS Windows, Emacs now warns when the obsolete _emacs init file is used, +and also when HOME is set to C:\ by default. + ** New configure.bat option --enable-checking builds Emacs with extra runtime checks. -- cgit v1.2.1 From 7b447e9bda80e5de478922771a62c2b3a8f9b2aa Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Fri, 20 Jan 2012 16:41:05 -0800 Subject: File-local variable fixes. * lisp/files.el (local-enable-local-variables): Doc fix. (inhibit-local-variables-regexps): Rename from inhibit-first-line-modes-regexps. Keep old name as obsolete alias. Doc fix. Add some extensions from auto-coding-alist. (inhibit-local-variables-suffixes): Rename from inhibit-first-line-modes-suffixes. Doc fix. (inhibit-local-variables-p): New function, extracted from set-auto-mode-1. (set-auto-mode): Doc fix. Respect inhibit-local-variables-regexps. (set-auto-mode-1): Doc fix. Use inhibit-local-variables-p. (hack-local-variables): Doc fix. Make the mode-only case respect enable-local-variables and friends. Respect inhibit-local-variables-regexps for file-locals, but not for directory-locals. (set-visited-file-name): Take account of inhibit-local-variables-regexps. Whether it applies may change as the file name is changed. * lisp/jka-cmpr-hook.el (jka-compr-install): * lisp/jka-compr.el (jka-compr-uninstall): Update for inhibit-first-line-modes-suffixes name change. * etc/NEWS: Mention this change. Fixes: debbugs:10506 --- etc/NEWS | 8 ++ lisp/ChangeLog | 23 ++++ lisp/files.el | 306 +++++++++++++++++++++++++++++++------------------- lisp/jka-cmpr-hook.el | 12 +- lisp/jka-compr.el | 9 +- 5 files changed, 234 insertions(+), 124 deletions(-) diff --git a/etc/NEWS b/etc/NEWS index 11537363ef4..743e3ce2e7b 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -369,6 +369,14 @@ turn on `whitespace-mode' for *vc-diff* buffers. Modes should call *** Using "mode: MINOR-MODE" to enable a minor mode is deprecated. Instead, use "eval: (minor-mode 1)". +FIXME: inhibit-first-line-modes-regexps was not mentioned in lispref, +but this probably should be. +*** The variable `inhibit-first-line-modes-regexps' has been renamed +to `inhibit-local-variables-regexps'. As the name suggests, it now +applies to ALL file local variables, not just -*- mode ones. +The associated `inhibit-first-line-modes-suffixes' has been renamed +in the corresponding way. + +++ ** The variable `focus-follows-mouse' now always defaults to nil. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 71211ca9af9..248de3429fa 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,26 @@ +2012-01-21 Glenn Morris + + * files.el (local-enable-local-variables): Doc fix. + (inhibit-local-variables-regexps): Rename from + inhibit-first-line-modes-regexps. Keep old name as obsolete alias. + Doc fix. Add some extensions from auto-coding-alist. + (inhibit-local-variables-suffixes): + Rename from inhibit-first-line-modes-suffixes. Doc fix. + (inhibit-local-variables-p): + New function, extracted from set-auto-mode-1. + (set-auto-mode): Doc fix. Respect inhibit-local-variables-regexps. + (set-auto-mode-1): Doc fix. Use inhibit-local-variables-p. + (hack-local-variables): Doc fix. Make the mode-only case + respect enable-local-variables and friends. + Respect inhibit-local-variables-regexps for file-locals, but + not for directory-locals. + (set-visited-file-name): + Take account of inhibit-local-variables-regexps. + Whether it applies may change as the file name is changed. + * jka-cmpr-hook.el (jka-compr-install): + * jka-compr.el (jka-compr-uninstall): + Update for inhibit-first-line-modes-suffixes name change. + 2012-01-20 Martin Rudalics * help-macro.el (make-help-screen): Temporarily restore original diff --git a/lisp/files.el b/lisp/files.el index 6056a70d4a1..7a72775ac3f 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -510,14 +510,36 @@ and ignores this variable." (other :tag "Query" other)) :group 'find-file) +;; This is an odd variable IMO. +;; You might wonder why it is needed, when we could just do: +;; (set (make-local-variable 'enable-local-variables) nil) +;; These two are not precisely the same. +;; Setting this variable does not cause -*- mode settings to be +;; ignored, whereas setting enable-local-variables does. +;; Only three places in Emacs use this variable: tar and arc modes, +;; and rmail. The first two don't need it. They already use +;; inhibit-local-variables-regexps, which is probably enough, and +;; could also just set enable-local-variables locally to nil. +;; Them setting it has the side-effect that dir-locals cannot apply to +;; eg tar files (?). FIXME Is this appropriate? +;; AFAICS, rmail is the only thing that needs this, and the only +;; reason it uses it is for BABYL files (which are obsolete). +;; These contain "-*- rmail -*-" in the first line, which rmail wants +;; to respect, so that find-file on a BABYL file will switch to +;; rmail-mode automatically (this is nice, but hardly essential, +;; since most people are used to explicitly running a command to +;; access their mail; M-x gnus etc). Rmail files may happen to +;; contain Local Variables sections in messages, which Rmail wants to +;; ignore. So AFAICS the only reason this variable exists is for a +;; minor convenience feature for handling of an obsolete Rmail file format. (defvar local-enable-local-variables t "Like `enable-local-variables' but meant for buffer-local bindings. The meaningful values are nil and non-nil. The default is non-nil. If a major mode sets this to nil, buffer-locally, then any local -variables list in the file will be ignored. +variables list in a file visited in that mode will be ignored. -This variable does not affect the use of major modes -specified in a -*- line.") +This variable does not affect the use of major modes specified +in a -*- line.") (defcustom enable-local-eval 'maybe "Control processing of the \"variable\" `eval' in a file's local variables. @@ -2475,17 +2497,55 @@ of a script, mode MODE is enabled. See also `auto-mode-alist'.") -(defvar inhibit-first-line-modes-regexps - (mapcar 'purecopy '("\\.tar\\'" "\\.tgz\\'" "\\.tiff?\\'" - "\\.gif\\'" "\\.png\\'" "\\.jpe?g\\'")) - "List of regexps; if one matches a file name, don't look for `-*-'. -See also `inhibit-first-line-modes-suffixes'.") - -(defvar inhibit-first-line-modes-suffixes nil - "List of regexps for what to ignore, for `inhibit-first-line-modes-regexps'. -When checking `inhibit-first-line-modes-regexps', we first discard +(define-obsolete-variable-alias 'inhibit-first-line-modes-regexps + 'inhibit-file-local-variables-regexps "24.1") + +;; TODO really this should be a list of modes (eg tar-mode), not regexps, +;; because we are duplicating info from auto-mode-alist. +;; TODO many elements of this list are also in auto-coding-alist. +(defvar inhibit-local-variables-regexps + (mapcar 'purecopy '("\\.tar\\'" "\\.t[bg]z\\'" + "\\.arc\\'" "\\.zip\\'" "\\.lzh\\'" "\\.lha\\'" + "\\.zoo\\'" "\\.[jew]ar\\'" "\\.xpi\\'" "\\.rar\\'" + "\\.7z\\'" + "\\.sx[dmicw]\\'" "\\.odt\\'" + "\\.tiff?\\'" "\\.gif\\'" "\\.png\\'" "\\.jpe?g\\'")) + "List of regexps matching file names in which to ignore local variables. +This includes `-*-' lines as well as trailing \"Local Variables\" sections. +Files matching this list are typically binary file formats. +They may happen to contain sequences that look like local variable +specifications, but are not really, or they may be containers for +member files with their own local variable sections, which are +not appropriate for the containing file. +See also `inhibit-local-variables-suffixes'.") + +(define-obsolete-variable-alias 'inhibit-first-line-modes-suffixes + 'inhibit-local-variables-suffixes "24.1") + +(defvar inhibit-local-variables-suffixes nil + "List of regexps matching suffixes to remove from file names. +When checking `inhibit-local-variables-regexps', we first discard from the end of the file name anything that matches one of these regexps.") +;; TODO explicitly add case-fold-search t? +(defun inhibit-local-variables-p () + "Return non-nil if file local variables should be ignored. +This checks the file (or buffer) name against `inhibit-local-variables-regexps' +and `inhibit-local-variables-suffixes'." + (let ((temp inhibit-local-variables-regexps) + (name (if buffer-file-name + (file-name-sans-versions buffer-file-name) + (buffer-name)))) + (while (let ((sufs inhibit-local-variables-suffixes)) + (while (and sufs (not (string-match (car sufs) name))) + (setq sufs (cdr sufs))) + sufs) + (setq name (substring name 0 (match-beginning 0)))) + (while (and temp + (not (string-match (car temp) name))) + (setq temp (cdr temp))) + temp)) + (defvar auto-mode-interpreter-regexp (purecopy "#![ \t]?\\([^ \t\n]*\ /bin/env[ \t]\\)?\\([^ \t\n]+\\)") @@ -2549,21 +2609,23 @@ Also applies to `magic-fallback-mode-alist'.") "Select major mode appropriate for current buffer. To find the right major mode, this function checks for a -*- mode tag -\(unless `inhibit-first-line-modes-regexps' says not to), checks for a `mode:' entry in the Local Variables section of the file, checks if it uses an interpreter listed in `interpreter-mode-alist', matches the buffer beginning against `magic-mode-alist', compares the filename against the entries in `auto-mode-alist', then matches the buffer beginning against `magic-fallback-mode-alist'. -If `enable-local-variables' is nil, this function does not check for -any mode: tag anywhere in the file. +If `enable-local-variables' is nil, or if the file name matches +`inhibit-local-variables-regexps', this function does not check +for any mode: tag anywhere in the file. If `local-enable-local-variables' +is nil, then the only mode: tag that can be relevant is a -*- one. If the optional argument KEEP-MODE-IF-SAME is non-nil, then we set the major mode only if that would change it. In other words we don't actually set it to the same mode the buffer already has." ;; Look for -*-MODENAME-*- or -*- ... mode: MODENAME; ... -*- - (let (end done mode modes) + (let ((try-locals (not (inhibit-local-variables-p))) + end done mode modes) ;; Once we drop the deprecated feature where mode: is also allowed to ;; specify minor-modes (ie, there can be more than one "mode:"), we can ;; remove this section and just let (hack-local-variables t) handle it. @@ -2571,7 +2633,9 @@ we don't actually set it to the same mode the buffer already has." (save-excursion (goto-char (point-min)) (skip-chars-forward " \t\n") + ;; Note by design local-enable-local-variables does not matter here. (and enable-local-variables + try-locals (setq end (set-auto-mode-1)) (if (save-excursion (search-forward ":" end t)) ;; Find all specifications for the `mode:' variable @@ -2602,8 +2666,12 @@ we don't actually set it to the same mode the buffer already has." (or (set-auto-mode-0 mode keep-mode-if-same) ;; continuing would call minor modes again, toggling them off (throw 'nop nil)))))) + ;; hack-local-variables checks local-enable-local-variables etc, but + ;; we might as well be explicit here for the sake of clarity. (and (not done) enable-local-variables + local-enable-local-variables + try-locals (setq mode (hack-local-variables t)) (not (memq mode modes)) ; already tried and failed (if (not (functionp mode)) @@ -2713,38 +2781,24 @@ same, do nothing and return nil." (defun set-auto-mode-1 () "Find the -*- spec in the buffer. Call with point at the place to start searching from. -If one is found, set point to the beginning -and return the position of the end. -Otherwise, return nil; point may be changed." +If one is found, set point to the beginning and return the position +of the end. Otherwise, return nil; may change point. +The variable `inhibit-local-variables-regexps' can cause a -*- spec to +be ignored; but `enable-local-variables' and `local-enable-local-variables' +have no effect." (let (beg end) (and ;; Don't look for -*- if this file name matches any - ;; of the regexps in inhibit-first-line-modes-regexps. - (let ((temp inhibit-first-line-modes-regexps) - (name (if buffer-file-name - (file-name-sans-versions buffer-file-name) - (buffer-name)))) - (while (let ((sufs inhibit-first-line-modes-suffixes)) - (while (and sufs (not (string-match (car sufs) name))) - (setq sufs (cdr sufs))) - sufs) - (setq name (substring name 0 (match-beginning 0)))) - (while (and temp - (not (string-match (car temp) name))) - (setq temp (cdr temp))) - (not temp)) - + ;; of the regexps in inhibit-local-variables-regexps. + (not (inhibit-local-variables-p)) (search-forward "-*-" (line-end-position - ;; If the file begins with "#!" - ;; (exec interpreter magic), look - ;; for mode frobs in the first two - ;; lines. You cannot necessarily - ;; put them in the first line of - ;; such a file without screwing up - ;; the interpreter invocation. - ;; The same holds for - ;; '\" - ;; in man pages (preprocessor + ;; If the file begins with "#!" (exec + ;; interpreter magic), look for mode frobs + ;; in the first two lines. You cannot + ;; necessarily put them in the first line + ;; of such a file without screwing up the + ;; interpreter invocation. The same holds + ;; for '\" in man pages (preprocessor ;; magic for the `man' program). (and (looking-at "^\\(#!\\|'\\\\\"\\)") 2)) t) (progn @@ -3089,19 +3143,41 @@ Uses `hack-local-variables-apply' to apply the variables. If MODE-ONLY is non-nil, all we do is check whether a \"mode:\" is specified, and return the corresponding mode symbol, or nil. In this case, we try to ignore minor-modes, and only return a -major-mode." +major-mode. + +If `enable-local-variables' or `local-enable-local-variables' is nil, +this function does nothing. If `inhibit-local-variables-regexps' +applies to the file in question, the file is not scanned for +local variables, but directory-local variables may still be applied." + ;; We don't let inhibit-local-variables-p influence the value of + ;; enable-local-variables, because then it would affect dir-local + ;; variables. We don't want to search eg tar files for file local + ;; variable sections, but there is no reason dir-locals cannot apply + ;; to them. The real meaning of inhibit-local-variables-p is "do + ;; not scan this file for local variables". (let ((enable-local-variables (and local-enable-local-variables enable-local-variables)) result) (unless mode-only (setq file-local-variables-alist nil) (report-errors "Directory-local variables error: %s" + ;; Note this is a no-op if enable-local-variables is nil. (hack-dir-local-variables))) - (when (or mode-only enable-local-variables) - ;; If MODE-ONLY is non-nil, and the prop line specifies a mode, - ;; then we're done, and have no need to scan further. - (unless (and (setq result (hack-local-variables-prop-line mode-only)) - mode-only) + ;; This entire function is basically a no-op if enable-local-variables + ;; is nil. All it does is set file-local-variables-alist to nil. + (when enable-local-variables + ;; This part used to ignore enable-local-variables when mode-only + ;; was non-nil. That was inappropriate, eg consider the + ;; (artificial) example of: + ;; (setq local-enable-local-variables nil) + ;; Open a file foo.txt that contains "mode: sh". + ;; It correctly opens in text-mode. + ;; M-x set-visited-file name foo.c, and it incorrectly stays in text-mode. + (unless (or (inhibit-local-variables-p) + ;; If MODE-ONLY is non-nil, and the prop line specifies a + ;; mode, then we're done, and have no need to scan further. + (and (setq result (hack-local-variables-prop-line mode-only)) + mode-only)) ;; Look for "Local variables:" line in last page. (save-excursion (goto-char (point-max)) @@ -3191,14 +3267,13 @@ major-mode." (indirect-variable var)) val) result) (error nil))))) - (forward-line 1))))))))) - ;; Now we've read all the local variables. - ;; If MODE-ONLY is non-nil, return whether the mode was specified. - (cond (mode-only result) - ;; Otherwise, set the variables. - (enable-local-variables - (hack-local-variables-filter result nil) - (hack-local-variables-apply))))) + (forward-line 1)))))))) + ;; Now we've read all the local variables. + ;; If MODE-ONLY is non-nil, return whether the mode was specified. + (if mode-only result + ;; Otherwise, set the variables. + (hack-local-variables-filter result nil) + (hack-local-variables-apply))))) (defun hack-local-variables-apply () "Apply the elements of `file-local-variables-alist'. @@ -3610,7 +3685,7 @@ the old visited file has been renamed to the new name FILENAME." (interactive "FSet visited file name: ") (if (buffer-base-buffer) (error "An indirect buffer cannot visit a file")) - (let (truename) + (let (truename old-try-locals) (if filename (setq filename (if (string-equal filename "") @@ -3635,7 +3710,8 @@ the old visited file has been renamed to the new name FILENAME." (progn (and filename (lock-buffer filename)) (unlock-buffer))) - (setq buffer-file-name filename) + (setq old-try-locals (not (inhibit-local-variables-p)) + buffer-file-name filename) (if filename ; make buffer name reflect filename. (let ((new-name (file-name-nondirectory buffer-file-name))) (setq default-directory (file-name-directory buffer-file-name)) @@ -3655,59 +3731,63 @@ the old visited file has been renamed to the new name FILENAME." (setq buffer-file-number (if filename (nthcdr 10 (file-attributes buffer-file-name)) - nil))) - ;; write-file-functions is normally used for things like ftp-find-file - ;; that visit things that are not local files as if they were files. - ;; Changing to visit an ordinary local file instead should flush the hook. - (kill-local-variable 'write-file-functions) - (kill-local-variable 'local-write-file-hooks) - (kill-local-variable 'revert-buffer-function) - (kill-local-variable 'backup-inhibited) - ;; If buffer was read-only because of version control, - ;; that reason is gone now, so make it writable. - (if vc-mode - (setq buffer-read-only nil)) - (kill-local-variable 'vc-mode) - ;; Turn off backup files for certain file names. - ;; Since this is a permanent local, the major mode won't eliminate it. - (and buffer-file-name - backup-enable-predicate - (not (funcall backup-enable-predicate buffer-file-name)) - (progn - (make-local-variable 'backup-inhibited) - (setq backup-inhibited t))) - (let ((oauto buffer-auto-save-file-name)) - ;; If auto-save was not already on, turn it on if appropriate. - (if (not buffer-auto-save-file-name) - (and buffer-file-name auto-save-default - (auto-save-mode t)) - ;; If auto save is on, start using a new name. - ;; We deliberately don't rename or delete the old auto save - ;; for the old visited file name. This is because perhaps - ;; the user wants to save the new state and then compare with the - ;; previous state from the auto save file. - (setq buffer-auto-save-file-name - (make-auto-save-file-name))) - ;; Rename the old auto save file if any. - (and oauto buffer-auto-save-file-name - (file-exists-p oauto) - (rename-file oauto buffer-auto-save-file-name t))) - (and buffer-file-name - (not along-with-file) - (set-buffer-modified-p t)) - ;; Update the major mode, if the file name determines it. - (condition-case nil - ;; Don't change the mode if it is special. - (or (not change-major-mode-with-file-name) - (get major-mode 'mode-class) - ;; Don't change the mode if the local variable list specifies it. - (hack-local-variables t) - ;; TODO consider making normal-mode handle this case. - (let ((old major-mode)) - (set-auto-mode t) - (or (eq old major-mode) - (hack-local-variables)))) - (error nil))) + nil)) + ;; write-file-functions is normally used for things like ftp-find-file + ;; that visit things that are not local files as if they were files. + ;; Changing to visit an ordinary local file instead should flush the hook. + (kill-local-variable 'write-file-functions) + (kill-local-variable 'local-write-file-hooks) + (kill-local-variable 'revert-buffer-function) + (kill-local-variable 'backup-inhibited) + ;; If buffer was read-only because of version control, + ;; that reason is gone now, so make it writable. + (if vc-mode + (setq buffer-read-only nil)) + (kill-local-variable 'vc-mode) + ;; Turn off backup files for certain file names. + ;; Since this is a permanent local, the major mode won't eliminate it. + (and buffer-file-name + backup-enable-predicate + (not (funcall backup-enable-predicate buffer-file-name)) + (progn + (make-local-variable 'backup-inhibited) + (setq backup-inhibited t))) + (let ((oauto buffer-auto-save-file-name)) + ;; If auto-save was not already on, turn it on if appropriate. + (if (not buffer-auto-save-file-name) + (and buffer-file-name auto-save-default + (auto-save-mode t)) + ;; If auto save is on, start using a new name. + ;; We deliberately don't rename or delete the old auto save + ;; for the old visited file name. This is because perhaps + ;; the user wants to save the new state and then compare with the + ;; previous state from the auto save file. + (setq buffer-auto-save-file-name + (make-auto-save-file-name))) + ;; Rename the old auto save file if any. + (and oauto buffer-auto-save-file-name + (file-exists-p oauto) + (rename-file oauto buffer-auto-save-file-name t))) + (and buffer-file-name + (not along-with-file) + (set-buffer-modified-p t)) + ;; Update the major mode, if the file name determines it. + (condition-case nil + ;; Don't change the mode if it is special. + (or (not change-major-mode-with-file-name) + (get major-mode 'mode-class) + ;; Don't change the mode if the local variable list specifies it. + ;; The file name can influence whether the local variables apply. + (and old-try-locals + ;; h-l-v also checks it, but might as well be explcit. + (not (inhibit-local-variables-p)) + (hack-local-variables t)) + ;; TODO consider making normal-mode handle this case. + (let ((old major-mode)) + (set-auto-mode t) + (or (eq old major-mode) + (hack-local-variables)))) + (error nil)))) (defun write-file (filename &optional confirm) "Write current buffer into file FILENAME. diff --git a/lisp/jka-cmpr-hook.el b/lisp/jka-cmpr-hook.el index d09e64634c3..600ed549731 100644 --- a/lisp/jka-cmpr-hook.el +++ b/lisp/jka-cmpr-hook.el @@ -119,7 +119,7 @@ based on the filename itself and `jka-compr-compression-info-list'." (defun jka-compr-install () "Install jka-compr. This adds entries to `file-name-handler-alist' and `auto-mode-alist' -and `inhibit-first-line-modes-suffixes'." +and `inhibit-local-variables-suffixes'." (setq jka-compr-file-name-handler-entry (cons (jka-compr-build-file-regexp) 'jka-compr-handler)) @@ -145,12 +145,12 @@ and `inhibit-first-line-modes-suffixes'." ;; are chosen right according to the file names ;; sans `.gz'. (push (list (jka-compr-info-regexp x) nil 'jka-compr) auto-mode-alist) - ;; Also add these regexps to - ;; inhibit-first-line-modes-suffixes, so that a - ;; -*- line in the first file of a compressed tar - ;; file doesn't override tar-mode. + ;; Also add these regexps to inhibit-local-variables-suffixes, + ;; so that a -*- line in the first file of a compressed tar file, + ;; or a Local Variables section in a member file at the end of + ;; the tar file don't override tar-mode. (push (jka-compr-info-regexp x) - inhibit-first-line-modes-suffixes))) + inhibit-local-variables-suffixes))) (setq auto-mode-alist (append auto-mode-alist jka-compr-mode-alist-additions)) diff --git a/lisp/jka-compr.el b/lisp/jka-compr.el index 786e4292d5f..8a8d7cdbb52 100644 --- a/lisp/jka-compr.el +++ b/lisp/jka-compr.el @@ -657,16 +657,15 @@ It is not recommended to set this variable permanently to anything but nil.") (defun jka-compr-uninstall () "Uninstall jka-compr. This removes the entries in `file-name-handler-alist' and `auto-mode-alist' -and `inhibit-first-line-modes-suffixes' that were added +and `inhibit-local-variables-suffixes' that were added by `jka-compr-installed'." - ;; Delete from inhibit-first-line-modes-suffixes - ;; what jka-compr-install added. + ;; Delete from inhibit-local-variables-suffixes what jka-compr-install added. (mapc (function (lambda (x) (and (jka-compr-info-strip-extension x) - (setq inhibit-first-line-modes-suffixes + (setq inhibit-local-variables-suffixes (delete (jka-compr-info-regexp x) - inhibit-first-line-modes-suffixes))))) + inhibit-local-variables-suffixes))))) jka-compr-compression-info-list--internal) (let* ((fnha (cons nil file-name-handler-alist)) -- cgit v1.2.1 From 117a9ea130c92a79b9b6f2a0bdc5fb297256d19c Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Fri, 20 Jan 2012 16:42:09 -0800 Subject: * lisp/international/mule.el (auto-coding-alist): Add .tbz. --- lisp/ChangeLog | 2 ++ lisp/international/mule.el | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 248de3429fa..58579e18727 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,7 @@ 2012-01-21 Glenn Morris + * international/mule.el (auto-coding-alist): Add .tbz. + * files.el (local-enable-local-variables): Doc fix. (inhibit-local-variables-regexps): Rename from inhibit-first-line-modes-regexps. Keep old name as obsolete alias. diff --git a/lisp/international/mule.el b/lisp/international/mule.el index 17163071d3f..d4dd4e4cf24 100644 --- a/lisp/international/mule.el +++ b/lisp/international/mule.el @@ -1668,6 +1668,7 @@ in-place." ;;; FILE I/O +;; TODO many elements of this list are also in inhibit-local-variables-regexps. (defcustom auto-coding-alist ;; .exe and .EXE are added to support archive-mode looking at DOS ;; self-extracting exe archives. @@ -1677,7 +1678,7 @@ arc\\|zip\\|lzh\\|lha\\|zoo\\|[jew]ar\\|xpi\\|rar\\|7z\\|\ ARC\\|ZIP\\|LZH\\|LHA\\|ZOO\\|[JEW]AR\\|XPI\\|RAR\\|7Z\\)\\'" . no-conversion-multibyte) ("\\.\\(exe\\|EXE\\)\\'" . no-conversion) - ("\\.\\(sx[dmicw]\\|odt\\|tar\\|tgz\\)\\'" . no-conversion) + ("\\.\\(sx[dmicw]\\|odt\\|tar\\|t[bg]z\\)\\'" . no-conversion) ("\\.\\(gz\\|Z\\|bz\\|bz2\\|xz\\|gpg\\)\\'" . no-conversion) ("\\.\\(jpe?g\\|png\\|gif\\|tiff?\\|p[bpgn]m\\)\\'" . no-conversion) ("\\.pdf\\'" . no-conversion) -- cgit v1.2.1 From dd6f2a637de3c4e91a2633e06344b6a0e3bbac70 Mon Sep 17 00:00:00 2001 From: Jay Belanger Date: Fri, 20 Jan 2012 18:46:09 -0600 Subject: calc/calc-units.el (math-put-default-units): Don't use "1" as a default unit. --- lisp/ChangeLog | 5 +++++ lisp/calc/calc-units.el | 19 ++++++++++--------- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 58579e18727..40e4a8a844a 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2012-01-21 Jay Belanger + + * calc/calc-units.el (math-put-default-units): Don't use "1" as a + default unit. + 2012-01-21 Glenn Morris * international/mule.el (auto-coding-alist): Add .tbz. diff --git a/lisp/calc/calc-units.el b/lisp/calc/calc-units.el index 8f4c79e3f0a..dcbf845c371 100644 --- a/lisp/calc/calc-units.el +++ b/lisp/calc/calc-units.el @@ -415,18 +415,19 @@ If EXPR is nil, return nil." (defun math-put-default-units (expr) "Put the units in EXPR in the default units table." - (let* ((units (math-get-units expr)) - (standard-units (math-get-standard-units expr)) + (let ((units (math-get-units expr))) + (unless (eq units 1) + (let* ((standard-units (math-get-standard-units expr)) (default-units (gethash standard-units math-default-units-table))) - (cond - ((not default-units) - (puthash standard-units (list units) math-default-units-table)) - ((not (equal units (car default-units))) - (puthash standard-units - (list units (car default-units)) - math-default-units-table))))) + (cond + ((not default-units) + (puthash standard-units (list units) math-default-units-table)) + ((not (equal units (car default-units))) + (puthash standard-units + (list units (car default-units)) + math-default-units-table))))))) (defun calc-convert-units (&optional old-units new-units) -- cgit v1.2.1 From 61086eb66b6a222124f302c197e14021711d29d3 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Fri, 20 Jan 2012 19:15:07 -0800 Subject: Document inhibit-local-variables-regexps in the lispref. * doc/lispref/modes.texi (Auto Major Mode): * doc/lispref/variables.texi (File Local Variables): Mention inhibit-local-variables-regexps. * etc/NEWS: Markup. --- doc/lispref/ChangeLog | 6 ++++++ doc/lispref/modes.texi | 12 ++++++++++++ doc/lispref/variables.texi | 7 +++++++ etc/NEWS | 3 +-- 4 files changed, 26 insertions(+), 2 deletions(-) diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index 44467d5f51b..872c4f564ac 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -1,3 +1,9 @@ +2012-01-21 Glenn Morris + + * modes.texi (Auto Major Mode): + * variables.texi (File Local Variables): + Mention inhibit-local-variables-regexps. + 2012-01-19 Martin Rudalics * windows.texi (Window Configurations): Rewrite references to diff --git a/doc/lispref/modes.texi b/doc/lispref/modes.texi index 5d09b79748e..b3aac231d5b 100644 --- a/doc/lispref/modes.texi +++ b/doc/lispref/modes.texi @@ -588,6 +588,18 @@ Chosen, emacs, The GNU Emacs Manual}. If @code{enable-local-variables} is @code{nil}, @code{set-auto-mode} does not check the @w{@samp{-*-}} line, or near the end of the file, for any mode tag. +@vindex inhibit-local-variables-regexps +There are some file types where it is not appropriate to scan the file +contents for a mode specifier. For example, a tar archive may happen to +contain, near the end of the file, a member file that has a local +variables section specifying a mode for that particular file. This +should not be applied to the containing tar file. Similarly, a tiff +image file might just happen to contain a first line that seems to +match the @w{@samp{-*-}} pattern. For these reasons, both these file +extensions are members of the list @var{inhibit-local-variables-regexps}. +Add patterns to this list to prevent Emacs searching them for local +variables of any kind (not just mode specifiers). + If @var{keep-mode-if-same} is non-@code{nil}, this function does not call the mode command if the buffer is already in the proper major mode. For instance, @code{set-visited-file-name} sets this to diff --git a/doc/lispref/variables.texi b/doc/lispref/variables.texi index b0a6795021b..a8f75f5a160 100644 --- a/doc/lispref/variables.texi +++ b/doc/lispref/variables.texi @@ -1660,6 +1660,13 @@ Query (once) about all the variables. @end table @end defopt +@defvar inhibit-local-variables-regexps +This is a list of regular expressions. If a file has a name +matching an element of this list, then it is not scanned for +any form of file-local variable. For examples of why you might want +to use this, @pxref{Auto Major Mode}. +@end defvar + @defun hack-local-variables &optional mode-only This function parses, and binds or evaluates as appropriate, any local variables specified by the contents of the current buffer. The variable diff --git a/etc/NEWS b/etc/NEWS index 743e3ce2e7b..b22f79225d5 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -369,8 +369,7 @@ turn on `whitespace-mode' for *vc-diff* buffers. Modes should call *** Using "mode: MINOR-MODE" to enable a minor mode is deprecated. Instead, use "eval: (minor-mode 1)". -FIXME: inhibit-first-line-modes-regexps was not mentioned in lispref, -but this probably should be. ++++ *** The variable `inhibit-first-line-modes-regexps' has been renamed to `inhibit-local-variables-regexps'. As the name suggests, it now applies to ALL file local variables, not just -*- mode ones. -- cgit v1.2.1 From f096042862cdc2d204dfa1017e01a222ea50ce80 Mon Sep 17 00:00:00 2001 From: Jérémy Compostella Date: Sat, 21 Jan 2012 11:02:34 +0100 Subject: Fix windmove-reference-loc miscalculation. --- lisp/ChangeLog | 5 +++++ lisp/windmove.el | 18 +++++++++--------- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 40e4a8a844a..4790ec98cf6 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2012-01-21 Jérémy Compostella + + * windmove.el (windmove-reference-loc): Fix + windmove-reference-loc miscalculation. + 2012-01-21 Jay Belanger * calc/calc-units.el (math-put-default-units): Don't use "1" as a diff --git a/lisp/windmove.el b/lisp/windmove.el index 10a564419fb..0523530869b 100644 --- a/lisp/windmove.el +++ b/lisp/windmove.el @@ -417,17 +417,17 @@ supplied, if ARG is greater or smaller than zero, respectively." (- (nth 3 edges) 1)))) (cond ((> effective-arg 0) - top-left) + top-left) ((< effective-arg 0) - bottom-right) + bottom-right) ((= effective-arg 0) - (windmove-coord-add - top-left - (let ((col-row - (posn-col-row - (posn-at-point (window-point window) window)))) - (cons (- (car col-row) (window-hscroll window)) - (cdr col-row))))))))) + (windmove-coord-add + top-left + ;; Don't care whether window is horizontally scrolled - + ;; `posn-at-point' handles that already. See also: + ;; http://lists.gnu.org/archive/html/emacs-devel/2012-01/msg00638.html + (posn-col-row + (posn-at-point (window-point window) window)))))))) ;; This uses the reference location in the current window (calculated ;; by `windmove-reference-loc' above) to find a reference location -- cgit v1.2.1 From 959ad23fb9020a121c4520946835e9f0aeb9bcb2 Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Sat, 21 Jan 2012 11:54:19 +0100 Subject: * process.c (read_process_output): Use p instead of XPROCESS (proc). (send_process): Likewise. --- src/ChangeLog | 5 +++++ src/process.c | 10 ++++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index faaea4057c5..925bb8299ba 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2012-01-21 Andreas Schwab + + * process.c (read_process_output): Use p instead of XPROCESS (proc). + (send_process): Likewise. + 2012-01-19 Martin Rudalics * window.c (save_window_save, Fcurrent_window_configuration) diff --git a/src/process.c b/src/process.c index 3dc753f5159..bdf16b7dbd2 100644 --- a/src/process.c +++ b/src/process.c @@ -5060,9 +5060,8 @@ read_process_output (Lisp_Object proc, register int channel) proc_buffered_char[channel] = -1; } #ifdef HAVE_GNUTLS - if (XPROCESS (proc)->gnutls_p) - nbytes = emacs_gnutls_read (XPROCESS (proc), - chars + carryover + buffered, + if (p->gnutls_p) + nbytes = emacs_gnutls_read (p, chars + carryover + buffered, readmax - buffered); else #endif @@ -5527,9 +5526,8 @@ send_process (volatile Lisp_Object proc, const char *volatile buf, #endif { #ifdef HAVE_GNUTLS - if (XPROCESS (proc)->gnutls_p) - written = emacs_gnutls_write (XPROCESS (proc), - buf, this); + if (p->gnutls_p) + written = emacs_gnutls_write (p, buf, this); else #endif written = emacs_write (outfd, buf, this); -- cgit v1.2.1 From 7a22e700110b98363a940b14efa8ad5af57c29e2 Mon Sep 17 00:00:00 2001 From: Ognyan Kulev Date: Sat, 21 Jan 2012 22:58:38 +0800 Subject: Update TUTORIAL.bg. --- admin/FOR-RELEASE | 6 +- etc/ChangeLog | 4 + etc/NEWS | 17 +- etc/tutorials/TUTORIAL.bg | 692 +++++++++++++++++++------------------ etc/tutorials/TUTORIAL.translators | 4 +- 5 files changed, 365 insertions(+), 358 deletions(-) diff --git a/admin/FOR-RELEASE b/admin/FOR-RELEASE index 6b10d51b970..9335e5b1fbe 100644 --- a/admin/FOR-RELEASE +++ b/admin/FOR-RELEASE @@ -100,10 +100,10 @@ names of the people who have checked it. SECTION READERS ---------------------------------- TUTORIAL cyd -TUTORIAL.bg +TUTORIAL.bg ogi TUTORIAL.cn TUTORIAL.cs -TUTORIAL.de +TUTORIAL.de wl TUTORIAL.eo TUTORIAL.es TUTORIAL.fr @@ -215,7 +215,7 @@ minibuf.texi modes.texi nonascii.texi numbers.texi -objects.texi +objects.texi cyd os.texi package.texi positions.texi diff --git a/etc/ChangeLog b/etc/ChangeLog index c6ba86a029a..60ccded8ad6 100644 --- a/etc/ChangeLog +++ b/etc/ChangeLog @@ -1,3 +1,7 @@ +2012-01-21 Ognyan Kulev + + * tutorials/TUTORIAL.bg: Updated; synchronize with TUTORIAL. + 2012-01-19 Werner Lemberg * tutorial/TUTORIAL.de: Updated; synchronize with TUTORIAL. diff --git a/etc/NEWS b/etc/NEWS index b22f79225d5..40a1c194365 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -1382,20 +1382,19 @@ Use `filter-buffer-substring-functions' instead. * Changes in Emacs 24.1 on non-free operating systems --- -** On MS Windows, Emacs now warns when the obsolete _emacs init file is used, +** On MS Windows, Emacs warns when using the obsolete init file _emacs, and also when HOME is set to C:\ by default. -** New configure.bat option --enable-checking builds Emacs with extra -runtime checks. +** New configure.bat options -** New configure.bat option --distfiles to specify files to be -included in binary distribution. +*** --enable-checking builds Emacs with extra runtime checks. -** New configure.bat option --without-gnutls to disable automatic -GnuTLS detection. +*** --distfiles specifies files to be included in binary distribution. -** New configure.bat option --lib for general library linkage, works -with the USER_LIBS build variable. +*** --without-gnutls disables automatic GnuTLS detection. + +*** --lib for general library linkage, works with the USER_LIBS build +variable. ** New make target `dist' to create binary distribution for MS Windows. diff --git a/etc/tutorials/TUTORIAL.bg b/etc/tutorials/TUTORIAL.bg index 22f96f169b9..91198961bff 100644 --- a/etc/tutorials/TUTORIAL.bg +++ b/etc/tutorials/TUTORIAL.bg @@ -1,4 +1,4 @@ - . . + . . - CONTROL ( CTRL CTL) META ( EDIT @@ -14,14 +14,14 @@ ALT). ESC <>. , ESC. - : C-x C-c. - ">>" . : + : C-x C-c. ( .) + , C-g. + >> . : <> ->> C-v ( ), - . - ( , CONTROL, v). - , - . +>> C-v ( ), + . ( , CONTROL, + v). , + . , , ; , @@ -30,8 +30,8 @@ ALT). , , . , C-v. , M-v -( META v, v, - META, EDIT ALT). +( META v, v, + META, EDIT ALT). >> M-v C-v . @@ -49,7 +49,11 @@ ALT). >> . C-l. - , . + , , + . + C-l, + . C-l + . PageUp PageDown , , @@ -65,7 +69,7 @@ ALT). . , - C-p, C-b, C-f C-n. - , : + : (Previous), C-p : @@ -76,38 +80,37 @@ ALT). (Next), C-n >> , - C-n C-p. C-l, , + C-n C-p. C-l , . , -, , : P Previous (), N -Next (), B Backward () F Forward (). - -. +, , : P Previous (), N + Next (), B Backward () F Forward (). + + . ->> C-n, . +>> C-n, . ->> C-f C-p. +>> C-f C-p. C-p, . , - . - ( , - ). + . ( + , .) >> C-b . . , . -C-f C-b. +C-f , C-b. ->> C-b , - . C-f, - . C-f, +>> C-b, + . C-f, + . C-f, . , - . "". + . . , . @@ -146,9 +149,8 @@ Control- , . - "". -, -. + . , + . , , : @@ -175,7 +177,7 @@ Control- , M-> (Meta -), . - "<" , + < , Shift, . Shift, M-<; Shift M-. @@ -206,17 +208,17 @@ Shift ( EDIT ALT), , : , META. C-u, - . " ", + . , , . -, C-u 8 C-f . + C-u 8 C-f . >> C-n C-p , , , . , . -( , ) -- +( , ) , , . @@ -234,13 +236,8 @@ C-v bar), . , . ->> - . - , . - ->> , - . , - , . + , +. * @@ -263,7 +260,7 @@ bar), * ------------------- - "", + , . , , @@ -272,16 +269,16 @@ bar), , . - , "n". + , n. >> C-x C-l ( ), - "n" . + n . * ---------- - , + , . - . @@ -301,57 +298,52 @@ bar), >> C-x 1 . , , -, . C-x. - , C-x; - , , . - , . +, . CONTROL-x. + , CONTROL-x; + , , . + , . * ---------------------- , . , - , , 7, * .., - . ( - ), . - - , , -. -- , - , - . , - , "Delete", "Del" -"Backspace". + , , 7, * .., . + , ( , + Enter). - "Backspace", , - . - "Delete" , . + +, . , +Backspace . -- , -. + , + , . ->> -- , - . , - ; - . . +>> , + . , + ; . + . , -, "" . - ("\") (, , - ) , -. +, . + , +( ) + . , + (\) +- . >> , , . . ->> , , - . . +>> , , + . . . . , , . ->> . +>> . . >> , , @@ -361,48 +353,52 @@ bar), ; . . ->> -- C-u 8 *, ********. +>> C-u 8 *, ********. - . . : - - C-d + + C-d - M- - M-d + M- + M-d - C-k - M-k + C-k + M-k -, C-d, M- M-d, - , C-f M-f (, - , ). C-k -M-k C-e M-e , , - -- . +, C-d, M- M-d, +, C-f M-f (, + , ). C-k M-k + C-e M-e , , +. - -. C-@ -C- ( ). - C-w. -. + +. C- ( +).. , +. , +, C-. C-w. + . ->> "" . ->> C-. "Mark set" +>> ̓ . +>> C-. Mark set . ->> "" "" . ->> C-w. , "" - "". - - "" (kill, cut) "" (delete) , -"" , "" - . - "" (yank, paste). , , - , ( - ), , +>> . +>> C-w. , ̓ + . + + (kill, cut) (delete) , + , + ( + . -). + (yank, paste). , , + , ( +), , , ( - ). + ). C-d + , . + . >> , . C-k, . @@ -414,14 +410,16 @@ C-k C-k : . . C-u 2 C-k ; - C-k . + C-k . - "". ( + . ( , , , .) , - , , + , , . ; - . + . + (kill) (yank) (cut) + (paste) (. ). C-y. . @@ -466,31 +464,30 @@ C-k -------- , -, , C-x -u. +, , C-/. - C-x u , ; - C-x u , - . + C-/ , ; + C-/ , + . : , , ( ), , -20 . ( C-x u, , - .) +20 . ( C-/, , + .) ->> C-k, C-x u - . +>> C-k, C-/ + . -C-_ ; C-x u, -- . -C_- , . - C-x u. C-_ - /, CONTROL. +C-_ ; C-/. + C-/ C-_ . + , C-x u C-/, - +. - C-_ C-x u . + C-/, C-_ C-x u +. - + . C-y; . @@ -501,35 +498,35 @@ C_- , , , . , -. , "" - . ( "" -.) +. , +(find) . ( + (visit) .) , . . , , , , -"" . , - , . + (save) . , + , . , , , - , . - , , - "-b:-- TUTORIAL.bg" . - , . - , "TUTORIAL.bg", - - . -, . + , , + b:--- TUTORIAL.bg . + , . + , TUTORIAL.bg, +- . , + . , - , . " -" ( ). + , . , + ( ). C-x C-f . , , . - , . + , . , . @@ -541,35 +538,36 @@ C_- . , , - . C-x C-f , - . , C-x C-f -. + . C-x C-f + , . . , - C-x C-s + C-x C-s (save) . , , , - . "~" + . ~ . , , . , - , . + , +(. -). ->> C-x C-s, . - "Wrote ...TUTORIAL.bg" . +>> C-x C-s TUTORIAL.bg . + TUTORIAL.bg + Wrote ...TUTORIAL.bg . , . , . : , , -. "" , - , . -, . +. , + , . , + . * @@ -579,53 +577,50 @@ C_- , C-x C-f. . ->> "foo", C-x C-f foo . - , "foo" - C-x C-s. - C-x C-f TUTORIAL.bg , - . + , . + . + , - , "". - . -, , + C-x C-b - C-x C-b +>> C-x C-b . ->> C-x C-b . +, , , + . , + , . - , , - . , , - . +>> C-x 1, . ->> C-x 1, . - - , "" + , . , . - , "" . + , . , , , C-x C-f. - : C-x b. . ->> C-x b foo , "foo", - "foo". C-x b TUTORIAL - , . +>> foo C-x C-f foo . + C-x b TUTORIAL.bg , + . ( ). . - , C-x C-b, - . + , C-x C-b, + , . , , -. . , - "*Buffer List*", . , - , C-x C-b. -, "*Messages*", ; +. . , +*Buffer List*, C-x C-b, +. , . +TUTORIAL.bg , , + C-x C-s . + +, *Messages*, ; , . >> C-x b *Messages* , - . C-x b TUTORIAL , + . C-x b TUTORIAL.bg , . @@ -636,14 +631,15 @@ C-f. . C-x C-f, C-x C-s. - C-x s + C-x s (some) C-x s , , -. . +. +. ->> , C-x s. - , "TUTORIAL". - "" , "y". +>> , C-x s. + , TUTORIAL.bg. + , y (yes). * @@ -659,53 +655,47 @@ C-x s , -, , . : - C-x C-f (Find) C-x C-s (Save). - -- -C-x C-c. ( , , - ; C-x C-c , - .) - -C-z ** -- - -. - - , , C-z "" (suspend) , -.. , . - "fg" "%emacs". - - , , C-z -, , - ; -"" . "exit" - . - - C-x C-c , -. , - , - . - , , -, - C-z, -. + C-x C-f (Find) C-x C-s (Save). + -- C-x +C-c. ( , , +; C-x C-c , + .) + + , + . + . + , + , +(suspend) . + +C-z ** + -. + , C-z , .. , + (job) . + fg %emacs. C-x. , : - C-x C-f . - C-x C-s . - C-x C-b . - C-x C-c . - C-x 1 . - C-x u . - - , --, , . - replace-string, -. M-x, -M-x , -"replace-string". "repl s" -. ( Tab, -CapsLock Shift .) - . - - replace-string -- , + C-x C-f + C-x C-s + C-x s + C-x C-b + C-x b + C-x C-c + C-x 1 + C-x u + + (X) , + -, , +. replace-string, + . M-x, + M-x , + replace-string. repl s + . ( Tab, + CapsLock Shift +.) . + + replace-string , , , . . @@ -713,28 +703,26 @@ CapsLock M-x repl s : - ------ "", + ------ , . -: C-\. - * ----------------------- , , , . - , " -" , . + , + , . # ; , - "hello.c", + hello.c, "#hello.c#". , . , , (, , ) -M-x recover file. , +M-x recover-file . , yes, . @@ -743,28 +731,28 @@ M-x recover file. -------------- , , - , , " ". + , , . . * ---------------- - " " (mode line). + (mode line). : --b:** TUTORIAL.bg (Fundamental)--L670--58%---------------- + b:**- TUTORIAL.bg 63% L744 (Fundamental) , . - -- , -. -NN%-- ; -, NN . - , --Top-- () ---00%--. , --Bot-- (). - , , -, --All--. + , +. NN% ; , + NN . + , Top () 0%. + , Bot (bottom ). +, , , + All (). L : . @@ -776,13 +764,13 @@ M-x recover file. , . Fundamental (), . -" " (major mode). + (major mode). . / , -, . - - , "Fundamental" . +Lisp (), Text () . + + , Fundamental . . , , @@ -793,9 +781,9 @@ Fundamental ( Fundamental. , , -- (text). +- Text (). ->> M-x text mode. +>> M-x text-mode . , , , . , M-f @@ -804,13 +792,13 @@ Fundamental ( . : - " " , + , - . , C-h m. ->> C-u C-v , +>> C-l C-l , . >> C-h m, . @@ -824,20 +812,20 @@ m. , , . - , , + , , , (Auto Fill mode). , , , . , M-x -auto fill mode. , - M-x auto fill mode. , +auto-fill-mode . , + M-x auto-fill-mode. , , , . , - " ". + (toggle) . ->> M-x auto fill mode . - "asdf " , , +>> M-x auto-fill-mode . + asdf , , . , . @@ -866,51 +854,42 @@ auto fill mode. ; , . - - , "". , + . , , . C-s , C-r . ! . - C-s, , "I-search" + C-s, , I-search . , , , , . . >> C-s, . , - , "", + , , , . - "" . ->> C-s, "". ->> . + . +>> C-s, . +>> . >> , . ? , , , . - "", + , C-s. , , - "" (failing). C-g . - -: C-s - . , -"" , " " -(flow control), C-s . - , C-q. " - " (Spontaneous Entry to Incremental -Search) -"". - - , + (failing). C-g +. + + , , . , , - "", "". , - "", "". - . "" - , "". + , . , + , . + . + , . ( - -- , , + , , C-s C-r), . C-s , , @@ -924,9 +903,11 @@ C-s , . +( , , + , , . + .) ->> C-u 0 C-l ( - CONTROL-L, CONTROL-1). +>> C-l C-l. >> C-x 2, . . @@ -935,7 +916,7 @@ C-s >> C-M-v, . ( META, ESC C-v.) ->> C-x o ("o" "other" -- ""), +>> C-x o (o other ), . >> C-v M-v , . @@ -946,32 +927,32 @@ C-s . C-x o, -. , - . - , . - " ". +. , , + , , . + . , + . C-M-v , . , , C-M-v. -C-M-v CONTROL-META. META, - C-M-v, CONTROL META, - v. CONTROL META " -", , , - . +C-M-v CONTROL-META. META +( Alt), C-M-v, CONTROL +META, v. CONTROL META + , , , + . - META ESC , - : ESC, CONTROL-v, -CONTROL-ESC v . , ESC -, . + META , + : , CONTROL-v, + CONTROL- v . , + , . >> C-x 1 ( ), . ( C-x 1 , . - " -- , - ".) + , + .) . C-x C-f, , @@ -989,22 +970,47 @@ CONTROL-ESC v . +* +----------------- + + . (frame) , + , , , + .. , + . + . + . + +>> M-x make-frame . + . + + , + . . + +>> M-x delete-frame + . + + +, - , X + . , + . + + * ----------------------------- - , " -" (recursive editing level). + , + (recursive editing level). , . , [(Fundamental)] (Fundamental). - , ESC ESC -ESC. "". - () , - . + , + . . + () , + . ->> M-x, ; ESC ESC - ESC, . +>> M-x, ; + , . C-g, . , C-g @@ -1028,13 +1034,10 @@ CONTROL-h, . C-h , , C-g, . -( C-h. - , - . -, C-h , - F1 M-x help .) +( C-h , + F1 M-x help .) -- C-h c. C-h, c +- C-h c. C-h, c , ; . @@ -1045,10 +1048,10 @@ CONTROL-h, C-p runs the command previous-line (C-p -) - " ". + . - . , , - -- , + , , . , C-x C-s ( META EDIT @@ -1070,7 +1073,7 @@ c. C-h f . . ->> C-h f previous-line. +>> C-h f previous-line . , , C-p. @@ -1086,11 +1089,12 @@ c. , . ->> C-h a file. +>> C-h a file . M-x , - "file" . C-x -C-f, , find-file. + file () . +C-x C-f, , +find-file. >> C-M-v, . . @@ -1098,7 +1102,7 @@ C-f, >> C-x 1, . C-h i (Info). - , "*info*", + , *info*, . m emacs , . @@ -1113,8 +1117,8 @@ C-f, ----------------- , - , ( (Help) -F10 h r). , , + , ( (Help) +C-h r). , , (completion), , dired, . @@ -1122,8 +1126,8 @@ F10 h r). *Messages*, C-x b *M , , . - - "" -("Completion"). + - +(Completion). Dired ( : ), , @@ -1138,13 +1142,11 @@ Dired * ------------ -: , C-x C-c. - , --, C-z. + , C-x C-c. -, , --- ! +, , + ! * @@ -1160,26 +1162,28 @@ Dired This version of the tutorial, like GNU Emacs, is copyrighted, and comes with permission to distribute copies on certain conditions: -Copyright (C) 1985, 1996, 1998, 2001-2012 Free Software Foundation, Inc. + Copyright (C) 1985, 1996, 1998, 2001-2012 Free Software Foundation, Inc. + + This file is part of GNU Emacs. + + GNU Emacs is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. - Permission is granted to anyone to make or distribute verbatim copies - of this document as received, in any medium, provided that the - copyright notice and permission notice are preserved, - and that the distributor grants the recipient permission - for further redistribution as permitted by this notice. + GNU Emacs is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. - Permission is granted to distribute modified versions - of this document, or of portions of it, - under the above conditions, provided also that they - carry prominent notices stating who last altered them. + You should have received a copy of the GNU General Public License + along with GNU Emacs. If not, see . - -, . , COPYING . -(""), , ! +(), , ! - -. + . ;;; Local Variables: ;;; coding: windows-1251 diff --git a/etc/tutorials/TUTORIAL.translators b/etc/tutorials/TUTORIAL.translators index 3408ef79fd3..3ec948eb79a 100644 --- a/etc/tutorials/TUTORIAL.translators +++ b/etc/tutorials/TUTORIAL.translators @@ -2,8 +2,8 @@ This file contains the list of translators and maintainers of the tutorial. * TUTORIAL.bg: -Author: Ognyan Kulev -Maintainer: Ognyan Kulev +Author: Ognyan Kulev +Maintainer: Ognyan Kulev * TUTORIAL.cn: Author: Sun Yijiang -- cgit v1.2.1 From 3c2907f7e83d2a324aca245b5cb1b8c84a1055e7 Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Sat, 21 Jan 2012 23:52:46 +0800 Subject: Make second arg of copysign non-optional. * src/floatfns.c (Fcopysign): Make the second argument non-optional, since nil is not allowed anyway. --- src/ChangeLog | 5 +++++ src/floatfns.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/ChangeLog b/src/ChangeLog index 925bb8299ba..c8b1e654830 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2012-01-21 Chong Yidong + + * floatfns.c (Fcopysign): Make the second argument non-optional, + since nil is not allowed anyway. + 2012-01-21 Andreas Schwab * process.c (read_process_output): Use p instead of XPROCESS (proc). diff --git a/src/floatfns.c b/src/floatfns.c index c44784f2120..305c78cae63 100644 --- a/src/floatfns.c +++ b/src/floatfns.c @@ -294,7 +294,7 @@ DEFUN ("isnan", Fisnan, Sisnan, 1, 1, 0, } #ifdef HAVE_COPYSIGN -DEFUN ("copysign", Fcopysign, Scopysign, 1, 2, 0, +DEFUN ("copysign", Fcopysign, Scopysign, 2, 2, 0, doc: /* Copy sign of X2 to value of X1, and return the result. Cause an error if X1 or X2 is not a float. */) (Lisp_Object x1, Lisp_Object x2) -- cgit v1.2.1 From cc6d5805ba054948ee5151e93b4b1318e2a4f5b2 Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Sat, 21 Jan 2012 17:02:53 +0100 Subject: * net/tramp-sh.el (tramp-default-user-alist): Don't add "plink", "plink1" and "psftp". (Bug#10530) --- lisp/ChangeLog | 7 ++++++- lisp/net/tramp-sh.el | 4 ++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index cbedfa287fa..63679e1580f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,4 +1,9 @@ -20122-01-21 Kenichi Handa +2012-01-21 Michael Albinus + + * net/tramp-sh.el (tramp-default-user-alist): Don't add "plink", + "plink1" and "psftp". (Bug#10530) + +2012-01-21 Kenichi Handa * international/mule-cmds.el (prefer-coding-system): Show a warning message if the default value of file-name-coding-system diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el index 2478253841f..e078a227061 100644 --- a/lisp/net/tramp-sh.el +++ b/lisp/net/tramp-sh.el @@ -419,13 +419,13 @@ detected as prompt when being sent on echoing hosts, therefore.") `(,(concat "\\`" (regexp-opt '("su" "sudo" "ksu")) "\\'") nil "root")) ;; Do not add "ssh" based methods, otherwise ~/.ssh/config would be ignored. +;; Do not add "plink" and "psftp", they ask interactively for the user. ;;;###tramp-autoload (add-to-list 'tramp-default-user-alist `(,(concat "\\`" (regexp-opt - '("rcp" "remcp" "rsh" "telnet" "krlogin" - "plink" "plink1" "pscp" "psftp" "fcp")) + '("rcp" "remcp" "rsh" "telnet" "krlogin" "pscp" "fcp")) "\\'") nil ,(user-login-name))) -- cgit v1.2.1 From fead402dddeefba612ab1222b392d5bd0c636400 Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Sun, 22 Jan 2012 00:04:55 +0800 Subject: Emacs Lisp manual updates. * doc/lispref/intro.texi (A Sample Function Description): Special notation used for macros too. * doc/lispref/objects.texi (Ctl-Char Syntax, Other Char Bits): Copyedits. (Symbol Type): Add xref for keyword symbols. (Sequence Type): Clarify differences between sequence types. (Cons Cell Type): Add "linked list" index entry. (Non-ASCII in Strings): Copyedits. (Equality Predicates): Symbols with same name need not be eq. * doc/lispref/numbers.texi (Float Basics): Document isnan, copysign, frexp and ldexp. Move float-e and float-pi to Math Functions node. --- doc/lispref/ChangeLog | 15 ++++ doc/lispref/intro.texi | 23 +++--- doc/lispref/numbers.texi | 124 ++++++++++++++-------------- doc/lispref/objects.texi | 207 ++++++++++++++++++++++++----------------------- etc/NEWS | 3 + 5 files changed, 202 insertions(+), 170 deletions(-) diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index 872c4f564ac..3c18de96d72 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -1,3 +1,18 @@ +2012-01-21 Chong Yidong + + * intro.texi (A Sample Function Description): Special notation + used for macros too. + + * objects.texi (Ctl-Char Syntax, Other Char Bits): Copyedits. + (Symbol Type): Add xref for keyword symbols. + (Sequence Type): Clarify differences between sequence types. + (Cons Cell Type): Add "linked list" index entry. + (Non-ASCII in Strings): Copyedits. + (Equality Predicates): Symbols with same name need not be eq. + + * numbers.texi (Float Basics): Document isnan, copysign, frexp and + ldexp. Move float-e and float-pi to Math Functions node. + 2012-01-21 Glenn Morris * modes.texi (Auto Major Mode): diff --git a/doc/lispref/intro.texi b/doc/lispref/intro.texi index 64c856d3ed4..a68bcfa0fe7 100644 --- a/doc/lispref/intro.texi +++ b/doc/lispref/intro.texi @@ -162,7 +162,7 @@ being described, are formatted like this: @var{first-number}. @cindex @code{nil} @cindex false - In Lisp, the symbol @code{nil} has three separate meanings: it + In Emacs Lisp, the symbol @code{nil} has three separate meanings: it is a symbol with the name @samp{nil}; it is the logical truth value @var{false}; and it is the empty list---the list of zero elements. When used as a variable, @code{nil} always has the value @code{nil}. @@ -396,13 +396,14 @@ Form', respectively. Commands are simply functions that may be called interactively; macros process their arguments differently from functions (the arguments are not evaluated), but are presented the same way. - Special form descriptions use a more complex notation to specify -optional and repeated arguments because they can break the argument -list down into separate arguments in more complicated ways. -@samp{@r{[}@var{optional-arg}@r{]}} means that @var{optional-arg} is -optional and @samp{@var{repeated-args}@dots{}} stands for zero or more -arguments. Parentheses are used when several arguments are grouped into -additional levels of list structure. Here is an example: + The descriptions of macros and special forms use a more complex +notation to specify optional and repeated arguments, because they can +break the argument list down into separate arguments in more +complicated ways. @samp{@r{[}@var{optional-arg}@r{]}} means that +@var{optional-arg} is optional and @samp{@var{repeated-args}@dots{}} +stands for zero or more arguments. Parentheses are used when several +arguments are grouped into additional levels of list structure. Here +is an example: @defspec count-loop (@var{var} [@var{from} @var{to} [@var{inc}]]) @var{body}@dots{} This imaginary special form implements a loop that executes the @@ -485,9 +486,9 @@ giving a prefix argument makes @var{here} non-@code{nil}. @end deffn @defvar emacs-build-time -The value of this variable indicates the time at which Emacs was built -at the local site. It is a list of three integers, like the value -of @code{current-time} (@pxref{Time of Day}). +The value of this variable indicates the time at which Emacs was +built. It is a list of three integers, like the value of +@code{current-time} (@pxref{Time of Day}). @example @group diff --git a/doc/lispref/numbers.texi b/doc/lispref/numbers.texi index 6768ecece9c..77db0f86c26 100644 --- a/doc/lispref/numbers.texi +++ b/doc/lispref/numbers.texi @@ -168,34 +168,37 @@ character codepoint. @node Float Basics @section Floating Point Basics +@cindex @acronym{IEEE} floating point Floating point numbers are useful for representing numbers that are not integral. The precise range of floating point numbers is machine-specific; it is the same as the range of the C data type -@code{double} on the machine you are using. +@code{double} on the machine you are using. Emacs uses the +@acronym{IEEE} floating point standard where possible (the standard is +supported by most modern computers). - The read-syntax for floating point numbers requires either a decimal + The read syntax for floating point numbers requires either a decimal point (with at least one digit following), an exponent, or both. For example, @samp{1500.0}, @samp{15e2}, @samp{15.0e2}, @samp{1.5e3}, and @samp{.15e4} are five ways of writing a floating point number whose -value is 1500. They are all equivalent. You can also use a minus sign -to write negative floating point numbers, as in @samp{-1.0}. +value is 1500. They are all equivalent. You can also use a minus +sign to write negative floating point numbers, as in @samp{-1.0}. + + Emacs Lisp treats @code{-0.0} as equal to ordinary zero (with +respect to @code{equal} and @code{=}), even though the two are +distinguishable in the @acronym{IEEE} floating point standard. -@cindex @acronym{IEEE} floating point @cindex positive infinity @cindex negative infinity @cindex infinity @cindex NaN - Most modern computers support the @acronym{IEEE} floating point standard, -which provides for positive infinity and negative infinity as floating point -values. It also provides for a class of values called NaN or -``not-a-number''; numerical functions return such values in cases where -there is no correct answer. For example, @code{(/ 0.0 0.0)} returns a -NaN. For practical purposes, there's no significant difference between -different NaN values in Emacs Lisp, and there's no rule for precisely -which NaN value should be used in a particular case, so Emacs Lisp -doesn't try to distinguish them (but it does report the sign, if you -print it). Here are the read syntaxes for these special floating -point values: + The @acronym{IEEE} floating point standard supports positive +infinity and negative infinity as floating point values. It also +provides for a class of values called NaN or ``not-a-number''; +numerical functions return such values in cases where there is no +correct answer. For example, @code{(/ 0.0 0.0)} returns a NaN. (NaN +values can also carry a sign, but for practical purposes there's no +significant difference between different NaN values in Emacs Lisp.) +Here are the read syntaxes for these special floating point values: @table @asis @item positive infinity @@ -206,16 +209,37 @@ point values: @samp{0.0e+NaN} or @samp{-0.0e+NaN}. @end table - To test whether a floating point value is a NaN, compare it with -itself using @code{=}. That returns @code{nil} for a NaN, and -@code{t} for any other floating point value. +@defun isnan number +This predicate tests whether its argument is NaN, and returns @code{t} +if so, @code{nil} otherwise. The argument must be a number. +@end defun + + The following functions are specialized for handling floating point +numbers: + +@defun frexp x +This function returns a cons cell @code{(@var{sig} . @var{exp})}, +where @var{sig} and @var{exp} are respectively the significand and +exponent of the floating point number @var{x}: + +@smallexample +@var{x} = @var{sig} * 2^@var{exp} +@end smallexample + +@var{sig} is a floating point number between 0.5 (inclusive) and 1.0 +(exclusive). If @var{x} is zero, the return value is @code{(0 . 0)}. +@end defun - The value @code{-0.0} is distinguishable from ordinary zero in -@acronym{IEEE} floating point, but Emacs Lisp @code{equal} and -@code{=} consider them equal values. +@defun ldexp sig &optional exp +This function returns a floating point number corresponding to the +significand @var{sig} and exponent @var{exp}. +@end defun - You can use @code{logb} to extract the binary exponent of a floating -point number (or estimate the logarithm of an integer): +@defun copysign x1 x2 +This function copies the sign of @var{x2} to the value of @var{x1}, +and returns the result. @var{x1} and @var{x2} must be floating point +numbers. +@end defun @defun logb number This function returns the binary exponent of @var{number}. More @@ -230,14 +254,6 @@ down to an integer. @end example @end defun -@defvar float-e -The mathematical constant @math{e} (2.71828@dots{}). -@end defvar - -@defvar float-pi -The mathematical constant @math{pi} (3.14159@dots{}). -@end defvar - @node Predicates on Numbers @section Type Predicates for Numbers @cindex predicates for numbers @@ -1122,35 +1138,15 @@ angle in radians between the vector @code{[@var{x}, @var{y}]} and the @end defun @defun exp arg -This is the exponential function; it returns -@tex -@math{e} -@end tex -@ifnottex -@i{e} -@end ifnottex -to the power @var{arg}. -@tex -@math{e} -@end tex -@ifnottex -@i{e} -@end ifnottex -is a fundamental mathematical constant also called the base of natural -logarithms. +This is the exponential function; it returns @math{e} to the power +@var{arg}. @end defun @defun log arg &optional base -This function returns the logarithm of @var{arg}, with base @var{base}. -If you don't specify @var{base}, the base -@tex -@math{e} -@end tex -@ifnottex -@i{e} -@end ifnottex -is used. If @var{arg} is negative, it signals a @code{domain-error} -error. +This function returns the logarithm of @var{arg}, with base +@var{base}. If you don't specify @var{base}, the natural base +@math{e} is used. If @var{arg} is negative, it signals a +@code{domain-error} error. @end defun @ignore @@ -1185,6 +1181,17 @@ This returns the square root of @var{arg}. If @var{arg} is negative, it signals a @code{domain-error} error. @end defun +In addition, Emacs defines the following common mathematical +constants: + +@defvar float-e +The mathematical constant @math{e} (2.71828@dots{}). +@end defvar + +@defvar float-pi +The mathematical constant @math{pi} (3.14159@dots{}). +@end defvar + @node Random Numbers @section Random Numbers @cindex random numbers @@ -1218,7 +1225,6 @@ nonnegative and less than @var{limit}. If @var{limit} is @code{t}, it means to choose a new seed based on the current time of day and on Emacs's process @acronym{ID} number. -@c "Emacs'" is incorrect usage! On some machines, any integer representable in Lisp may be the result of @code{random}. On other machines, the result can never be larger diff --git a/doc/lispref/objects.texi b/doc/lispref/objects.texi index 3fb676edcd4..87bcc20daba 100644 --- a/doc/lispref/objects.texi +++ b/doc/lispref/objects.texi @@ -427,10 +427,10 @@ codes for these non-@acronym{ASCII} control characters include the @ifnottex 2**26 @end ifnottex -bit as well as the code for the corresponding non-control -character. Ordinary terminals have no way of generating non-@acronym{ASCII} -control characters, but you can generate them straightforwardly using X -and other window systems. +bit as well as the code for the corresponding non-control character. +Ordinary text terminals have no way of generating non-@acronym{ASCII} +control characters, but you can generate them straightforwardly using +X and other window systems. For historical reasons, Emacs treats the @key{DEL} character as the control equivalent of @kbd{?}: @@ -501,10 +501,10 @@ character is upper case or lower case. Emacs uses the @end ifnottex bit to indicate that the shift key was used in typing a control character. This distinction is possible only when you use X terminals -or other special terminals; ordinary terminals do not report the -distinction to the computer in any way. The Lisp syntax for -the shift bit is @samp{\S-}; thus, @samp{?\C-\S-o} or @samp{?\C-\S-O} -represents the shifted-control-o character. +or other special terminals; ordinary text terminals do not report the +distinction. The Lisp syntax for the shift bit is @samp{\S-}; thus, +@samp{?\C-\S-o} or @samp{?\C-\S-O} represents the shifted-control-o +character. @cindex hyper characters @cindex super characters @@ -541,9 +541,9 @@ intended. But you can use one symbol in all of these ways, independently. A symbol whose name starts with a colon (@samp{:}) is called a -@dfn{keyword symbol}. These symbols automatically act as constants, and -are normally used only by comparing an unknown symbol with a few -specific alternatives. +@dfn{keyword symbol}. These symbols automatically act as constants, +and are normally used only by comparing an unknown symbol with a few +specific alternatives. @xref{Constant Variables}. @cindex @samp{\} in symbols @cindex backslash in symbols @@ -617,26 +617,28 @@ all symbols; @pxref{Creating Symbols}.) @subsection Sequence Types A @dfn{sequence} is a Lisp object that represents an ordered set of -elements. There are two kinds of sequence in Emacs Lisp, lists and -arrays. Thus, an object of type list or of type array is also -considered a sequence. - - Arrays are further subdivided into strings, vectors, char-tables and -bool-vectors. Vectors can hold elements of any type, but string -elements must be characters, and bool-vector elements must be @code{t} -or @code{nil}. Char-tables are like vectors except that they are -indexed by any valid character code. The characters in a string can -have text properties like characters in a buffer (@pxref{Text -Properties}), but vectors do not support text properties, even when -their elements happen to be characters. - - Lists, strings and the other array types are different, but they have -important similarities. For example, all have a length @var{l}, and all -have elements which can be indexed from zero to @var{l} minus one. -Several functions, called sequence functions, accept any kind of -sequence. For example, the function @code{elt} can be used to extract -an element of a sequence, given its index. @xref{Sequences Arrays -Vectors}. +elements. There are two kinds of sequence in Emacs Lisp: @dfn{lists} +and @dfn{arrays}. + + Lists are the most commonly-used sequences. A list can hold +elements of any type, and its length can be easily changed by adding +or removing elements. See the next subsection for more about lists. + + Arrays are fixed-length sequences. They are further subdivided into +strings, vectors, char-tables and bool-vectors. Vectors can hold +elements of any type, whereas string elements must be characters, and +bool-vector elements must be @code{t} or @code{nil}. Char-tables are +like vectors except that they are indexed by any valid character code. +The characters in a string can have text properties like characters in +a buffer (@pxref{Text Properties}), but vectors do not support text +properties, even when their elements happen to be characters. + + Lists, strings and the other array types also share important +similarities. For example, all have a length @var{l}, and all have +elements which can be indexed from zero to @var{l} minus one. Several +functions, called sequence functions, accept any kind of sequence. +For example, the function @code{length} reports the length of any kind +of sequence. @xref{Sequences Arrays Vectors}. It is generally impossible to read the same sequence twice, since sequences are always created anew upon reading. If you read the read @@ -650,24 +652,27 @@ same object, @code{nil}. @cindex decrement field of register @cindex pointers - A @dfn{cons cell} is an object that consists of two slots, called the -@sc{car} slot and the @sc{cdr} slot. Each slot can @dfn{hold} or -@dfn{refer to} any Lisp object. We also say that ``the @sc{car} of -this cons cell is'' whatever object its @sc{car} slot currently holds, -and likewise for the @sc{cdr}. - -@quotation -A note to C programmers: in Lisp, we do not distinguish between -``holding'' a value and ``pointing to'' the value, because pointers in -Lisp are implicit. -@end quotation + A @dfn{cons cell} is an object that consists of two slots, called +the @sc{car} slot and the @sc{cdr} slot. Each slot can @dfn{hold} any +Lisp object. We also say that ``the @sc{car} of this cons cell is'' +whatever object its @sc{car} slot currently holds, and likewise for +the @sc{cdr}. +@cindex list structure A @dfn{list} is a series of cons cells, linked together so that the @sc{cdr} slot of each cons cell holds either the next cons cell or the empty list. The empty list is actually the symbol @code{nil}. -@xref{Lists}, for functions that work on lists. Because most cons -cells are used as part of lists, the phrase @dfn{list structure} has -come to refer to any structure made out of cons cells. +@xref{Lists}, for details. Because most cons cells are used as part +of lists, we refer to any structure made out of cons cells as a +@dfn{list structure}. + +@cindex linked list +@quotation +A note to C programmers: a Lisp list thus works as a @dfn{linked list} +built up of cons cells. Because pointers in Lisp are implicit, we do +not distinguish between a cons cell slot ``holding'' a value versus +``pointing to'' the value. +@end quotation @cindex atoms Because cons cells are so central to Lisp, we also have a word for @@ -1025,40 +1030,40 @@ but the newline is ignored if escaped." @node Non-ASCII in Strings @subsubsection Non-@acronym{ASCII} Characters in Strings - You can include a non-@acronym{ASCII} international character in a string -constant by writing it literally. There are two text representations -for non-@acronym{ASCII} characters in Emacs strings (and in buffers): unibyte -and multibyte. If the string constant is read from a multibyte source, -such as a multibyte buffer or string, or a file that would be visited as -multibyte, then the character is read as a multibyte character, and that -makes the string multibyte. If the string constant is read from a -unibyte source, then the character is read as unibyte and that makes the -string unibyte. - - You can also represent a multibyte non-@acronym{ASCII} character with its -character code: use a hex escape, @samp{\x@var{nnnnnnn}}, with as many -digits as necessary. (Multibyte non-@acronym{ASCII} character codes are all -greater than 256.) Any character which is not a valid hex digit -terminates this construct. If the next character in the string could be -interpreted as a hex digit, write @w{@samp{\ }} (backslash and space) to -terminate the hex escape---for example, @w{@samp{\xe0\ }} represents -one character, @samp{a} with grave accent. @w{@samp{\ }} in a string -constant is just like backslash-newline; it does not contribute any -character to the string, but it does terminate the preceding hex escape. + You can include a non-@acronym{ASCII} international character in a +string constant by writing it literally. There are two text +representations for non-@acronym{ASCII} characters in Emacs strings +(and in buffers): unibyte and multibyte (@pxref{Text +Representations}). If the string constant is read from a multibyte +source, such as a multibyte buffer or string, or a file that would be +visited as multibyte, then Emacs reads the non-@acronym{ASCII} +character as a multibyte character and automatically makes the string +a multibyte string. If the string constant is read from a unibyte +source, then Emacs reads the non-@acronym{ASCII} character as unibyte, +and makes the string unibyte. + + Instead of writing a non-@acronym{ASCII} character literally into a +multibyte string, you can write it as its character code using a hex +escape, @samp{\x@var{nnnnnnn}}, with as many digits as necessary. +(Multibyte non-@acronym{ASCII} character codes are all greater than +256.) You can also specify a character in a multibyte string using +the @samp{\u} or @samp{\U} Unicode escape syntax (@pxref{General +Escape Syntax}). In either case, any character which is not a valid +hex digit terminates the construct. If the next character in the +string could be interpreted as a hex digit, write @w{@samp{\ }} +(backslash and space) to terminate the hex escape---for example, +@w{@samp{\xe0\ }} represents one character, @samp{a} with grave +accent. @w{@samp{\ }} in a string constant is just like +backslash-newline; it does not contribute any character to the string, +but it does terminate the preceding hex escape. Using any hex escape +in a string (even for an @acronym{ASCII} character) automatically +forces the string to be multibyte. You can represent a unibyte non-@acronym{ASCII} character with its character code, which must be in the range from 128 (0200 octal) to 255 (0377 octal). If you write all such character codes in octal and the string contains no other characters forcing it to be multibyte, -this produces a unibyte string. However, using any hex escape in a -string (even for an @acronym{ASCII} character) forces the string to be -multibyte. - - You can also specify characters in a string by their numeric values -in Unicode, using @samp{\u} and @samp{\U} (@pxref{Character Type}). - - @xref{Text Representations}, for more information about the two -text representations. +this produces a unibyte string. @node Nonprinting Characters @subsubsection Nonprinting Characters in Strings @@ -1922,23 +1927,24 @@ This function returns a symbol naming the primitive type of @section Equality Predicates @cindex equality - Here we describe functions that test for equality between any two -objects. Other functions test equality of contents between objects of specific -types, e.g., strings. For these predicates, see the appropriate chapter -describing the data type. + Here we describe functions that test for equality between two +objects. Other functions test equality of contents between objects of +specific types, e.g.@: strings. For these predicates, see the +appropriate chapter describing the data type. @defun eq object1 object2 This function returns @code{t} if @var{object1} and @var{object2} are -the same object, @code{nil} otherwise. - -@code{eq} returns @code{t} if @var{object1} and @var{object2} are -integers with the same value. Also, since symbol names are normally -unique, if the arguments are symbols with the same name, they are -@code{eq}. For other types (e.g., lists, vectors, strings), two -arguments with the same contents or elements are not necessarily -@code{eq} to each other: they are @code{eq} only if they are the same -object, meaning that a change in the contents of one will be reflected -by the same change in the contents of the other. +the same object, and @code{nil} otherwise. + +If @var{object1} and @var{object2} are integers with the same value, +they are considered to be the same object (i.e.@: @code{eq} returns +@code{t}). If @var{object1} and @var{object2} are symbols with the +same name, they are normally the same object---but see @ref{Creating +Symbols} for exceptions. For other types (e.g.@: lists, vectors, +strings), two arguments with the same contents or elements are not +necessarily @code{eq} to each other: they are @code{eq} only if they +are the same object, meaning that a change in the contents of one will +be reflected by the same change in the contents of the other. @example @group @@ -1988,6 +1994,7 @@ by the same change in the contents of the other. @end group @end example +@noindent The @code{make-symbol} function returns an uninterned symbol, distinct from the symbol that is used if you write the name in a Lisp expression. Distinct symbols with the same name are not @code{eq}. @xref{Creating @@ -2003,11 +2010,11 @@ Symbols}. @defun equal object1 object2 This function returns @code{t} if @var{object1} and @var{object2} have -equal components, @code{nil} otherwise. Whereas @code{eq} tests if its -arguments are the same object, @code{equal} looks inside nonidentical -arguments to see if their elements or contents are the same. So, if two -objects are @code{eq}, they are @code{equal}, but the converse is not -always true. +equal components, and @code{nil} otherwise. Whereas @code{eq} tests +if its arguments are the same object, @code{equal} looks inside +nonidentical arguments to see if their elements or contents are the +same. So, if two objects are @code{eq}, they are @code{equal}, but +the converse is not always true. @example @group @@ -2059,13 +2066,13 @@ always true. @end example Comparison of strings is case-sensitive, but does not take account of -text properties---it compares only the characters in the strings. Use -@code{equal-including-properties} to also compare text properties. For -technical reasons, a unibyte string and a multibyte string are -@code{equal} if and only if they contain the same sequence of -character codes and all these codes are either in the range 0 through -127 (@acronym{ASCII}) or 160 through 255 (@code{eight-bit-graphic}). -(@pxref{Text Representations}). +text properties---it compares only the characters in the strings. +@xref{Text Properties}. Use @code{equal-including-properties} to also +compare text properties. For technical reasons, a unibyte string and +a multibyte string are @code{equal} if and only if they contain the +same sequence of character codes and all these codes are either in the +range 0 through 127 (@acronym{ASCII}) or 160 through 255 +(@code{eight-bit-graphic}). (@pxref{Text Representations}). @example @group diff --git a/etc/NEWS b/etc/NEWS index 40a1c194365..f745645d6fb 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -1367,6 +1367,9 @@ This means that the empty symbol can now be read back. Also, #: by itself (when not immediately followed by a possible symbol character) stands for an empty uninterned symbol. ++++ +** New math functions `isnan', `copysign', `frexp', `ldexp'. + ** Obsolete functions and variables *** buffer-substring-filters is obsolete. -- cgit v1.2.1 From 0dc422898a3db349fd4f54ea1dae9458b004ec34 Mon Sep 17 00:00:00 2001 From: Lars Magne Ingebrigtsen Date: Sun, 22 Jan 2012 00:54:58 +0000 Subject: mm-decode.el (mm-interactively-view-part): Fix prompt. --- lisp/gnus/ChangeLog | 4 ++++ lisp/gnus/mm-decode.el | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index c7358779818..8e790962c34 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,7 @@ +2012-01-21 Lars Magne Ingebrigtsen + + * mm-decode.el (mm-interactively-view-part): Fix prompt. + 2012-01-10 Teodor Zlatanov * nntp.el (nntp-send-authinfo): Query `auth-source-search' with the diff --git a/lisp/gnus/mm-decode.el b/lisp/gnus/mm-decode.el index 10e0fa2861c..dd3eb6c9d96 100644 --- a/lisp/gnus/mm-decode.el +++ b/lisp/gnus/mm-decode.el @@ -1353,7 +1353,7 @@ Use CMD as the process." (mailcap-mime-info type 'all))) (method (let ((minibuffer-local-completion-map mm-viewer-completion-map)) - (completing-read "Viewer" methods)))) + (completing-read "Viewer: " methods)))) (when (string= method "") (error "No method given")) (if (string-match "^[^% \t]+$" method) -- cgit v1.2.1 From a5509865d7a0dd40bfb6217693ca2684a517d6d0 Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Sun, 22 Jan 2012 13:55:36 +0100 Subject: * net/tramp.el (tramp-action-login): Set connection property "login-as". * net/tramp-cache.el (tramp-dump-connection-properties): Do not dump properties, when "login-as" is set. * net/tramp-sh.el (tramp-methods): Add user spec to "pscp" and "psftp". (tramp-default-user-alist): Don't add "pscp". (tramp-do-copy-or-rename-file-out-of-band): Use connection property "login-as", if set. (Bug#10530) --- lisp/ChangeLog | 12 ++++++++++++ lisp/net/tramp-cache.el | 11 ++++++++--- lisp/net/tramp-sh.el | 24 ++++++++++++++++-------- lisp/net/tramp.el | 12 +++++++----- 4 files changed, 43 insertions(+), 16 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 63679e1580f..8ada003d23d 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,15 @@ +2012-01-22 Michael Albinus + + * net/tramp.el (tramp-action-login): Set connection property "login-as". + + * net/tramp-cache.el (tramp-dump-connection-properties): Do not dump + properties, when "login-as" is set. + + * net/tramp-sh.el (tramp-methods): Add user spec to "pscp" and "psftp". + (tramp-default-user-alist): Don't add "pscp". + (tramp-do-copy-or-rename-file-out-of-band): Use connection + property "login-as", if set. (Bug#10530) + 2012-01-21 Michael Albinus * net/tramp-sh.el (tramp-default-user-alist): Don't add "plink", diff --git a/lisp/net/tramp-cache.el b/lisp/net/tramp-cache.el index 03a5fe5b88e..d222dd1011d 100644 --- a/lisp/net/tramp-cache.el +++ b/lisp/net/tramp-cache.el @@ -243,7 +243,7 @@ PROPERTY is set persistent when KEY is a vector." (aset key 3 nil)) (let ((hash (or (gethash key tramp-cache-data) (puthash key (make-hash-table :test 'equal) - tramp-cache-data)))) + tramp-cache-data)))) (puthash property value hash) (setq tramp-cache-data-changed t) (tramp-message key 7 "%s %s" property value) @@ -329,10 +329,15 @@ KEY identifies the connection, it is either a process or a vector." tramp-cache-data-changed (stringp tramp-persistency-file-name)) (let ((cache (copy-hash-table tramp-cache-data))) - ;; Remove temporary data. + ;; Remove temporary data. If there is the key "login-as", we + ;; don't save either, because all other properties might + ;; depend on the login name, and we want to give the + ;; possibility to use another login name later on. (maphash (lambda (key value) - (if (and (vectorp key) (not (tramp-file-name-localname key))) + (if (and (vectorp key) + (not (tramp-file-name-localname key)) + (not (gethash "login-as" value))) (progn (remhash "process-name" value) (remhash "process-buffer" value) diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el index e078a227061..38e19730a6d 100644 --- a/lisp/net/tramp-sh.el +++ b/lisp/net/tramp-sh.el @@ -380,7 +380,7 @@ detected as prompt when being sent on echoing hosts, therefore.") (tramp-remote-shell "/bin/sh") (tramp-remote-shell-args ("-c")) (tramp-copy-program "pscp") - (tramp-copy-args (("-P" "%p") ("-scp") ("-p" "%k") + (tramp-copy-args (("-l" "%u") ("-P" "%p") ("-scp") ("-p" "%k") ("-q") ("-r"))) (tramp-copy-keep-date t) (tramp-copy-recursive t) @@ -394,7 +394,7 @@ detected as prompt when being sent on echoing hosts, therefore.") (tramp-remote-shell "/bin/sh") (tramp-remote-shell-args ("-c")) (tramp-copy-program "pscp") - (tramp-copy-args (("-P" "%p") ("-sftp") ("-p" "%k") + (tramp-copy-args (("-l" "%u") ("-P" "%p") ("-sftp") ("-p" "%k") ("-q") ("-r"))) (tramp-copy-keep-date t) (tramp-copy-recursive t) @@ -419,13 +419,12 @@ detected as prompt when being sent on echoing hosts, therefore.") `(,(concat "\\`" (regexp-opt '("su" "sudo" "ksu")) "\\'") nil "root")) ;; Do not add "ssh" based methods, otherwise ~/.ssh/config would be ignored. -;; Do not add "plink" and "psftp", they ask interactively for the user. +;; Do not add "plink" based methods, they ask interactively for the user. ;;;###tramp-autoload (add-to-list 'tramp-default-user-alist `(,(concat "\\`" - (regexp-opt - '("rcp" "remcp" "rsh" "telnet" "krlogin" "pscp" "fcp")) + (regexp-opt '("rcp" "remcp" "rsh" "telnet" "krlogin" "fcp")) "\\'") nil ,(user-login-name))) @@ -2281,8 +2280,10 @@ The method used must be an out-of-band method." ;; Set variables for computing the prompt for reading ;; password. (setq tramp-current-method (tramp-file-name-method v) - tramp-current-user (tramp-file-name-user v) - tramp-current-host (tramp-file-name-real-host v)) + tramp-current-user (or (tramp-file-name-user v) + (tramp-get-connection-property + v "login-as" nil)) + tramp-current-host (tramp-file-name-real-host v)) ;; Expand hops. Might be necessary for gateway methods. (setq v (car (tramp-compute-multi-hops v))) @@ -2309,8 +2310,15 @@ The method used must be an out-of-band method." (setq port (string-to-number (match-string 2 host)) host (string-to-number (match-string 1 host)))) + ;; Check for user. There might be an interactive setting. + (setq user (or (tramp-file-name-user v) + (tramp-get-connection-property v "login-as" nil))) + ;; Compose copy command. - (setq spec (format-spec-make + (setq host (or host "") + user (or user "") + port (or port "") + spec (format-spec-make ?h host ?u user ?p port ?t (tramp-get-connection-property (tramp-get-connection-process v) "temp-file" "") diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index 98295c6617a..f13315bc662 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -3115,13 +3115,15 @@ beginning of local filename are not substituted." (defun tramp-action-login (proc vec) "Send the login name." (when (not (stringp tramp-current-user)) - (save-window-excursion - (let ((enable-recursive-minibuffers t)) - (pop-to-buffer (tramp-get-connection-buffer vec)) - (setq tramp-current-user (read-string (match-string 0)))))) - (tramp-message vec 3 "Sending login name `%s'" tramp-current-user) + (setq tramp-current-user + (with-connection-property vec "login-as" + (save-window-excursion + (let ((enable-recursive-minibuffers t)) + (pop-to-buffer (tramp-get-connection-buffer vec)) + (read-string (match-string 0))))))) (with-current-buffer (tramp-get-connection-buffer vec) (tramp-message vec 6 "\n%s" (buffer-string))) + (tramp-message vec 3 "Sending login name `%s'" tramp-current-user) (tramp-send-string vec (concat tramp-current-user tramp-local-end-of-line))) (defun tramp-action-password (proc vec) -- cgit v1.2.1 From d1a5c3b45081c237658c6f6b74bbd6bc986acb60 Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Mon, 23 Jan 2012 02:10:50 +0100 Subject: lisp/subr.el (display-delayed-warnings): Collapse identical adjacent messages. --- lisp/ChangeLog | 5 +++++ lisp/subr.el | 15 +++++++++++++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 8ada003d23d..ff2b4b5f226 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2012-01-23 Juanma Barranquero + + * subr.el (display-delayed-warnings): + Collapse identical adjacent messages. + 2012-01-22 Michael Albinus * net/tramp.el (tramp-action-login): Set connection property "login-as". diff --git a/lisp/subr.el b/lisp/subr.el index 14f9192405c..da11b7e982a 100644 --- a/lisp/subr.el +++ b/lisp/subr.el @@ -1857,9 +1857,20 @@ FILE should be the name of a library, with no directory name." (defun display-delayed-warnings () "Display delayed warnings from `delayed-warnings-list'. +Collapse identical adjacent messages into one (plus count). This is the default value of `delayed-warnings-hook'." - (dolist (warning (nreverse delayed-warnings-list)) - (apply 'display-warning warning)) + (let ((count 1) + (warnings (nreverse delayed-warnings-list)) + warning) + (while warnings + (setq warning (pop warnings)) + (if (equal warning (car warnings)) + (setq count (1+ count)) + (when (> count 1) + (setcdr warning (cons (format "%s [%d times]" (cadr warning) count) + (cddr warning))) + (setq count 1)) + (apply 'display-warning warning)))) (setq delayed-warnings-list nil)) (defvar delayed-warnings-hook '(display-delayed-warnings) -- cgit v1.2.1 From 2724d9c71e29aa0aa298c3534b0b7b18d8fc6202 Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Mon, 23 Jan 2012 03:10:36 +0100 Subject: lisp/subr.el: Rework previous change. * lisp/subr.el (display-delayed-warnings): Doc fix. (collapse-delayed-warnings): New function to collapse identical adjacent warnings. (delayed-warnings-hook): Add it. --- lisp/ChangeLog | 6 ++++-- lisp/subr.el | 27 +++++++++++++++++---------- 2 files changed, 21 insertions(+), 12 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index ff2b4b5f226..96c18714709 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,7 +1,9 @@ 2012-01-23 Juanma Barranquero - * subr.el (display-delayed-warnings): - Collapse identical adjacent messages. + * subr.el (display-delayed-warnings): Doc fix. + (collapse-delayed-warnings): New function to collapse identical + adjacent warnings. + (delayed-warnings-hook): Add it. 2012-01-22 Michael Albinus diff --git a/lisp/subr.el b/lisp/subr.el index da11b7e982a..c9e213c86a0 100644 --- a/lisp/subr.el +++ b/lisp/subr.el @@ -1857,23 +1857,30 @@ FILE should be the name of a library, with no directory name." (defun display-delayed-warnings () "Display delayed warnings from `delayed-warnings-list'. -Collapse identical adjacent messages into one (plus count). -This is the default value of `delayed-warnings-hook'." +Used from `delayed-warnings-hook' (which see)." + (dolist (warning (nreverse delayed-warnings-list)) + (apply 'display-warning warning)) + (setq delayed-warnings-list nil)) + +(defun collapse-delayed-warnings () + "Remove duplicates from `delayed-warnings-list'. +Collapse identical adjacent warnings into one (plus count). +Used from `delayed-warnings-hook' (which see)." (let ((count 1) - (warnings (nreverse delayed-warnings-list)) - warning) - (while warnings - (setq warning (pop warnings)) - (if (equal warning (car warnings)) + collapsed warning) + (while delayed-warnings-list + (setq warning (pop delayed-warnings-list)) + (if (equal warning (car delayed-warnings-list)) (setq count (1+ count)) (when (> count 1) (setcdr warning (cons (format "%s [%d times]" (cadr warning) count) (cddr warning))) (setq count 1)) - (apply 'display-warning warning)))) - (setq delayed-warnings-list nil)) + (push warning collapsed))) + (setq delayed-warnings-list (nreverse collapsed)))) -(defvar delayed-warnings-hook '(display-delayed-warnings) +(defvar delayed-warnings-hook '(collapse-delayed-warnings + display-delayed-warnings) "Normal hook run to process delayed warnings. Functions in this hook should access the `delayed-warnings-list' variable (which see) and remove from it the warnings they process.") -- cgit v1.2.1 From 31cbea1d3d3c548025f70551514bd1a370301ccf Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Mon, 23 Jan 2012 12:23:50 +0800 Subject: Update several Lisp manual chapters. * doc/lispref/eval.texi (Intro Eval, Symbol Forms): Minor tweaks for correctness with lexical scoping. (Eval): Copyedits. * doc/lispref/sequences.texi (Sequence Functions): Don't repeat the introduction already given in the parent. (Vectors): Copyedits. (Rings): Move from lists.texi. Note that this is specific to the ring package. * doc/lispref/lists.texi (Cons Cells): Copyedits. (List Elements): Mention push. (List Variables): Mention pop. (Rings): Move to sequences.texi. * doc/lispref/strings.texi (Text Comparison): Minor qualification. * doc/lispref/symbols.texi (Definitions, Symbol Components): Mention variable scoping issues. (Plists and Alists): Copyedits. --- admin/FOR-RELEASE | 19 +++-- doc/lispref/ChangeLog | 23 ++++++ doc/lispref/control.texi | 10 +-- doc/lispref/elisp.texi | 2 +- doc/lispref/eval.texi | 24 +++---- doc/lispref/lists.texi | 163 ++++++++++------------------------------- doc/lispref/sequences.texi | 120 +++++++++++++++++++++++++++---- doc/lispref/strings.texi | 13 ++-- doc/lispref/symbols.texi | 176 ++++++++++++++++++++------------------------- 9 files changed, 281 insertions(+), 269 deletions(-) diff --git a/admin/FOR-RELEASE b/admin/FOR-RELEASE index 9335e5b1fbe..f704a3c9397 100644 --- a/admin/FOR-RELEASE +++ b/admin/FOR-RELEASE @@ -187,25 +187,25 @@ backups.texi buffers.texi commands.texi compile.texi -control.texi +control.texi cyd customize.texi debugging.texi display.texi edebug.texi elisp.texi errors.texi -eval.texi +eval.texi cyd files.texi frames.texi functions.texi -hash.texi +hash.texi cyd help.texi hooks.texi index.texi internals.texi intro.texi cyd keymaps.texi -lists.texi +lists.texi cyd loading.texi locals.texi macros.texi @@ -214,17 +214,17 @@ markers.texi minibuf.texi modes.texi nonascii.texi -numbers.texi +numbers.texi cyd objects.texi cyd os.texi package.texi positions.texi processes.texi searching.texi -sequences.texi +sequences.texi cyd streams.texi -strings.texi -symbols.texi +strings.texi cyd +symbols.texi cyd syntax.texi text.texi tips.texi @@ -232,8 +232,7 @@ variables.texi windows.texi * PLANNED ADDITIONS - -** pov-mode (probably not for Emacs-23: waiting for a Free POV-Ray). +* pov-mode (probably not for Emacs-23: waiting for a Free POV-Ray). ** gas-mode ? diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index 3c18de96d72..b66f82c5738 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -1,3 +1,26 @@ +2012-01-23 Chong Yidong + + * strings.texi (Text Comparison): Minor qualification. + + * lists.texi (Cons Cells): Copyedits. + (List Elements): Mention push. + (List Variables): Mention pop. + (Rings): Move to sequences.texi. + + * sequences.texi (Sequence Functions): Don't repeat the + introduction already given in the parent. + (Vectors): Copyedits. + (Rings): Move from lists.texi. Note that this is specific to the + ring package. + + * symbols.texi (Definitions, Symbol Components): Mention variable + scoping issues. + (Plists and Alists): Copyedits. + + * eval.texi (Intro Eval, Symbol Forms): Minor tweaks for + correctness with lexical scoping. + (Eval): Copyedits. + 2012-01-21 Chong Yidong * intro.texi (A Sample Function Description): Special notation diff --git a/doc/lispref/control.texi b/doc/lispref/control.texi index e74f3e198bf..0511f21007d 100644 --- a/doc/lispref/control.texi +++ b/doc/lispref/control.texi @@ -8,11 +8,11 @@ @cindex special forms for control structures @cindex control structures - A Lisp program consists of expressions or @dfn{forms} (@pxref{Forms}). -We control the order of execution of these forms by enclosing them in -@dfn{control structures}. Control structures are special forms which -control when, whether, or how many times to execute the forms they -contain. + A Lisp program consists of a set of @dfn{expressions}, or +@dfn{forms} (@pxref{Forms}). We control the order of execution of +these forms by enclosing them in @dfn{control structures}. Control +structures are special forms which control when, whether, or how many +times to execute the forms they contain. @cindex textual order The simplest order of execution is sequential execution: first form diff --git a/doc/lispref/elisp.texi b/doc/lispref/elisp.texi index 0b8d972c1d5..1555b98e7fb 100644 --- a/doc/lispref/elisp.texi +++ b/doc/lispref/elisp.texi @@ -326,7 +326,6 @@ Lists * Modifying Lists:: Storing new pieces into an existing list. * Sets And Lists:: A list can represent a finite mathematical set. * Association Lists:: A list can represent a finite relation or mapping. -* Rings:: Managing a fixed-size ring of objects. Modifying Existing List Structure @@ -344,6 +343,7 @@ Sequences, Arrays, and Vectors * Vector Functions:: Functions specifically for vectors. * Char-Tables:: How to work with char-tables. * Bool-Vectors:: How to work with bool-vectors. +* Rings:: Managing a fixed-size ring of objects. Hash Tables diff --git a/doc/lispref/eval.texi b/doc/lispref/eval.texi index adb4841a82d..fc18e503543 100644 --- a/doc/lispref/eval.texi +++ b/doc/lispref/eval.texi @@ -64,8 +64,8 @@ evaluate a @dfn{function call} form such as @code{(car x)}, Emacs first evaluates the argument (the subform @code{x}). After evaluating the argument, Emacs @dfn{executes} the function (@code{car}), and if the function is written in Lisp, execution works by evaluating the -@dfn{body} of the function. (In this example, however, @code{car} is -not a Lisp function; it is a primitive function implemented in C.) +@dfn{body} of the function (in this example, however, @code{car} is +not a Lisp function; it is a primitive function implemented in C). @xref{Functions}, for more information about functions and function calls. @@ -77,9 +77,8 @@ variables (@pxref{Variables}).@footnote{This definition of that can affect the result of a program.} Whenever a form refers to a variable without creating a new binding for it, the variable evaluates to the value given by the current environment. Evaluating a form may -create a new environment for recursive evaluation, by binding -variables (@pxref{Local Variables}). Such environments are temporary, -and vanish when the evaluation of the form is complete. +also temporarily alter the environment by binding variables +(@pxref{Local Variables}). @cindex side effect Evaluating a form may also make changes that persist; these changes @@ -177,9 +176,9 @@ program. Here is an example: @cindex symbol evaluation When a symbol is evaluated, it is treated as a variable. The result -is the variable's value, if it has one. If it has none (if its value -cell is void), an error is signaled. For more information on the use of -variables, see @ref{Variables}. +is the variable's value, if it has one. If the symbol has no value as +a variable, the Lisp interpreter signals an error. For more +information on the use of variables, see @ref{Variables}. In the following example, we set the value of a symbol with @code{setq}. Then we evaluate the symbol, and get back the value that @@ -602,12 +601,13 @@ functions provides the ability to pass information to them as arguments. @defun eval form &optional lexical -This is the basic function evaluating an expression. It evaluates +This is the basic function for evaluating an expression. It evaluates @var{form} in the current environment and returns the result. How the evaluation proceeds depends on the type of the object (@pxref{Forms}). -@var{lexical} if non-nil means to evaluate @var{form} using lexical scoping -rules (@pxref{Lexical Binding}) instead of the default dynamic scoping used -historically in Emacs Lisp. + +The argument @var{lexical}, if non-@code{nil}, means to evaluate +@var{form} using lexical scoping rules for variables, instead of the +default dynamic scoping rules. @xref{Lexical Binding}. Since @code{eval} is a function, the argument expression that appears in a call to @code{eval} is evaluated twice: once as preparation before diff --git a/doc/lispref/lists.texi b/doc/lispref/lists.texi index eb9ddf58603..c8433c79b54 100644 --- a/doc/lispref/lists.texi +++ b/doc/lispref/lists.texi @@ -23,7 +23,6 @@ the whole list. * Modifying Lists:: Storing new pieces into an existing list. * Sets And Lists:: A list can represent a finite mathematical set. * Association Lists:: A list can represent a finite relation or mapping. -* Rings:: Managing a fixed-size ring of objects. @end menu @node Cons Cells @@ -31,61 +30,56 @@ the whole list. @cindex lists and cons cells Lists in Lisp are not a primitive data type; they are built up from -@dfn{cons cells}. A cons cell is a data object that represents an -ordered pair. That is, it has two slots, and each slot @dfn{holds}, or -@dfn{refers to}, some Lisp object. One slot is known as the @sc{car}, -and the other is known as the @sc{cdr}. (These names are traditional; -see @ref{Cons Cell Type}.) @sc{cdr} is pronounced ``could-er.'' +@dfn{cons cells} (@pxref{Cons Cell Type}). A cons cell is a data +object that represents an ordered pair. That is, it has two slots, +and each slot @dfn{holds}, or @dfn{refers to}, some Lisp object. One +slot is known as the @sc{car}, and the other is known as the @sc{cdr}. +(These names are traditional; see @ref{Cons Cell Type}.) @sc{cdr} is +pronounced ``could-er.'' We say that ``the @sc{car} of this cons cell is'' whatever object its @sc{car} slot currently holds, and likewise for the @sc{cdr}. A list is a series of cons cells ``chained together,'' so that each -cell refers to the next one. There is one cons cell for each element of -the list. By convention, the @sc{car}s of the cons cells hold the -elements of the list, and the @sc{cdr}s are used to chain the list: the -@sc{cdr} slot of each cons cell refers to the following cons cell. The -@sc{cdr} of the last cons cell is @code{nil}. This asymmetry between -the @sc{car} and the @sc{cdr} is entirely a matter of convention; at the -level of cons cells, the @sc{car} and @sc{cdr} slots have the same -characteristics. +cell refers to the next one. There is one cons cell for each element +of the list. By convention, the @sc{car}s of the cons cells hold the +elements of the list, and the @sc{cdr}s are used to chain the list +(this asymmetry between @sc{car} and @sc{cdr} is entirely a matter of +convention; at the level of cons cells, the @sc{car} and @sc{cdr} +slots have similar properties). Hence, the @sc{cdr} slot of each cons +cell in a list refers to the following cons cell. @cindex true list - Since @code{nil} is the conventional value to put in the @sc{cdr} of -the last cons cell in the list, we call that case a @dfn{true list}. - - In Lisp, we consider the symbol @code{nil} a list as well as a -symbol; it is the list with no elements. For convenience, the symbol + Also by convention, the @sc{cdr} of the last cons cell in a list is +@code{nil}. We call such a @code{nil}-terminated structure a +@dfn{true list}. In Emacs Lisp, the symbol @code{nil} is both a +symbol and a list with no elements. For convenience, the symbol @code{nil} is considered to have @code{nil} as its @sc{cdr} (and also -as its @sc{car}). Therefore, the @sc{cdr} of a true list is always a -true list. +as its @sc{car}). + + Hence, the @sc{cdr} of a true list is always a true list. The +@sc{cdr} of a nonempty true list is a true list containing all the +elements except the first. @cindex dotted list @cindex circular list - If the @sc{cdr} of a list's last cons cell is some other value, -neither @code{nil} nor another cons cell, we call the structure a -@dfn{dotted list}, since its printed representation would use -@samp{.}. There is one other possibility: some cons cell's @sc{cdr} -could point to one of the previous cons cells in the list. We call -that structure a @dfn{circular list}. + If the @sc{cdr} of a list's last cons cell is some value other than +@code{nil}, we call the structure a @dfn{dotted list}, since its +printed representation would use dotted pair notation (@pxref{Dotted +Pair Notation}). There is one other possibility: some cons cell's +@sc{cdr} could point to one of the previous cons cells in the list. +We call that structure a @dfn{circular list}. For some purposes, it does not matter whether a list is true, -circular or dotted. If the program doesn't look far enough down the +circular or dotted. If a program doesn't look far enough down the list to see the @sc{cdr} of the final cons cell, it won't care. However, some functions that operate on lists demand true lists and signal errors if given a dotted list. Most functions that try to find the end of a list enter infinite loops if given a circular list. @cindex list structure - Because most cons cells are used as part of lists, the phrase -@dfn{list structure} has come to mean any structure made out of cons -cells. - - The @sc{cdr} of any nonempty true list @var{l} is a list containing all the -elements of @var{l} except the first. - - @xref{Cons Cell Type}, for the read and print syntax of cons cells and -lists, and for ``box and arrow'' illustrations of lists. + Because most cons cells are used as part of lists, we refer to any +structure made out of cons cells as a @dfn{list structure}. @node List-related Predicates @section Predicates on Lists @@ -257,6 +251,10 @@ x x @result{} (b c) @end example + +@noindent +For the @code{pop} macro, which removes an element from a list, +@xref{List Variables}. @end defmac @defun nth n list @@ -695,6 +693,10 @@ This macro provides an alternative way to write l @result{} (c a b) @end example + +@noindent +For the @code{pop} macro, which removes the first element from a list, +@xref{List Elements}. @end defmac Two functions modify lists that are the values of variables. @@ -1800,90 +1802,3 @@ often modifies the original list structure of @var{alist}. compares the @sc{cdr} of each @var{alist} association instead of the @sc{car}. @end defun - -@node Rings -@section Managing a Fixed-Size Ring of Objects - -@cindex ring data structure - This section describes functions for operating on rings. A -@dfn{ring} is a fixed-size data structure that supports insertion, -deletion, rotation, and modulo-indexed reference and traversal. - -@defun make-ring size -This returns a new ring capable of holding @var{size} objects. -@var{size} should be an integer. -@end defun - -@defun ring-p object -This returns @code{t} if @var{object} is a ring, @code{nil} otherwise. -@end defun - -@defun ring-size ring -This returns the maximum capacity of the @var{ring}. -@end defun - -@defun ring-length ring -This returns the number of objects that @var{ring} currently contains. -The value will never exceed that returned by @code{ring-size}. -@end defun - -@defun ring-elements ring -This returns a list of the objects in @var{ring}, in order, newest first. -@end defun - -@defun ring-copy ring -This returns a new ring which is a copy of @var{ring}. -The new ring contains the same (@code{eq}) objects as @var{ring}. -@end defun - -@defun ring-empty-p ring -This returns @code{t} if @var{ring} is empty, @code{nil} otherwise. -@end defun - - The newest element in the ring always has index 0. Higher indices -correspond to older elements. Indices are computed modulo the ring -length. Index @minus{}1 corresponds to the oldest element, @minus{}2 -to the next-oldest, and so forth. - -@defun ring-ref ring index -This returns the object in @var{ring} found at index @var{index}. -@var{index} may be negative or greater than the ring length. If -@var{ring} is empty, @code{ring-ref} signals an error. -@end defun - -@defun ring-insert ring object -This inserts @var{object} into @var{ring}, making it the newest -element, and returns @var{object}. - -If the ring is full, insertion removes the oldest element to -make room for the new element. -@end defun - -@defun ring-remove ring &optional index -Remove an object from @var{ring}, and return that object. The -argument @var{index} specifies which item to remove; if it is -@code{nil}, that means to remove the oldest item. If @var{ring} is -empty, @code{ring-remove} signals an error. -@end defun - -@defun ring-insert-at-beginning ring object -This inserts @var{object} into @var{ring}, treating it as the oldest -element. The return value is not significant. - -If the ring is full, this function removes the newest element to make -room for the inserted element. -@end defun - -@cindex fifo data structure - If you are careful not to exceed the ring size, you can -use the ring as a first-in-first-out queue. For example: - -@lisp -(let ((fifo (make-ring 5))) - (mapc (lambda (obj) (ring-insert fifo obj)) - '(0 one "two")) - (list (ring-remove fifo) t - (ring-remove fifo) t - (ring-remove fifo))) - @result{} (0 t one t "two") -@end lisp diff --git a/doc/lispref/sequences.texi b/doc/lispref/sequences.texi index 0ea32f99e12..94f1bf666d2 100644 --- a/doc/lispref/sequences.texi +++ b/doc/lispref/sequences.texi @@ -8,10 +8,10 @@ @chapter Sequences, Arrays, and Vectors @cindex sequence - Recall that the @dfn{sequence} type is the union of two other Lisp -types: lists and arrays. In other words, any list is a sequence, and -any array is a sequence. The common property that all sequences have is -that each is an ordered collection of elements. + The @dfn{sequence} type is the union of two other Lisp types: lists +and arrays. In other words, any list is a sequence, and any array is +a sequence. The common property that all sequences have is that each +is an ordered collection of elements. An @dfn{array} is a fixed-length object with a slot for each of its elements. All the elements are accessible in constant time. The four @@ -54,19 +54,17 @@ But it is possible to add elements to the list, or remove elements. * Vector Functions:: Functions specifically for vectors. * Char-Tables:: How to work with char-tables. * Bool-Vectors:: How to work with bool-vectors. +* Rings:: Managing a fixed-size ring of objects. @end menu @node Sequence Functions @section Sequences - In Emacs Lisp, a @dfn{sequence} is either a list or an array. The -common property of all sequences is that they are ordered collections of -elements. This section describes functions that accept any kind of -sequence. + This section describes functions that accept any kind of sequence. @defun sequencep object -Returns @code{t} if @var{object} is a list, vector, string, -bool-vector, or char-table, @code{nil} otherwise. +This function returns @code{t} if @var{object} is a list, vector, +string, bool-vector, or char-table, @code{nil} otherwise. @end defun @defun length sequence @@ -149,8 +147,9 @@ This function generalizes @code{aref} (@pxref{Array Functions}) and @defun copy-sequence sequence @cindex copying sequences -Returns a copy of @var{sequence}. The copy is the same type of object -as the original sequence, and it has the same elements in the same order. +This function returns a copy of @var{sequence}. The copy is the same +type of object as the original sequence, and it has the same elements +in the same order. Storing a new element into the copy does not affect the original @var{sequence}, and vice versa. However, the elements of the new @@ -394,8 +393,8 @@ symbol-lookup tables (@pxref{Creating Symbols}), as part of the representation of a byte-compiled function (@pxref{Byte Compilation}), and more. - In Emacs Lisp, the indices of the elements of a vector start from zero -and count up from there. + Like other arrays, vectors use zero-origin indexing: the first +element has index 0. Vectors are printed with square brackets surrounding the elements. Thus, a vector whose elements are the symbols @code{a}, @code{b} and @@ -728,3 +727,96 @@ bv @noindent These results make sense because the binary codes for control-_ and control-W are 11111 and 10111, respectively. + +@node Rings +@section Managing a Fixed-Size Ring of Objects + +@cindex ring data structure + A @dfn{ring} is a fixed-size data structure that supports insertion, +deletion, rotation, and modulo-indexed reference and traversal. An +efficient ring data structure is implemented by the @code{ring} +package. It provides the functions listed in this section. + + Note that several ``rings'' in Emacs, like the kill ring and the +mark ring, are actually implemented as simple lists, @emph{not} using +the @code{ring} package; thus the following functions won't work on +them. + +@defun make-ring size +This returns a new ring capable of holding @var{size} objects. +@var{size} should be an integer. +@end defun + +@defun ring-p object +This returns @code{t} if @var{object} is a ring, @code{nil} otherwise. +@end defun + +@defun ring-size ring +This returns the maximum capacity of the @var{ring}. +@end defun + +@defun ring-length ring +This returns the number of objects that @var{ring} currently contains. +The value will never exceed that returned by @code{ring-size}. +@end defun + +@defun ring-elements ring +This returns a list of the objects in @var{ring}, in order, newest first. +@end defun + +@defun ring-copy ring +This returns a new ring which is a copy of @var{ring}. +The new ring contains the same (@code{eq}) objects as @var{ring}. +@end defun + +@defun ring-empty-p ring +This returns @code{t} if @var{ring} is empty, @code{nil} otherwise. +@end defun + + The newest element in the ring always has index 0. Higher indices +correspond to older elements. Indices are computed modulo the ring +length. Index @minus{}1 corresponds to the oldest element, @minus{}2 +to the next-oldest, and so forth. + +@defun ring-ref ring index +This returns the object in @var{ring} found at index @var{index}. +@var{index} may be negative or greater than the ring length. If +@var{ring} is empty, @code{ring-ref} signals an error. +@end defun + +@defun ring-insert ring object +This inserts @var{object} into @var{ring}, making it the newest +element, and returns @var{object}. + +If the ring is full, insertion removes the oldest element to +make room for the new element. +@end defun + +@defun ring-remove ring &optional index +Remove an object from @var{ring}, and return that object. The +argument @var{index} specifies which item to remove; if it is +@code{nil}, that means to remove the oldest item. If @var{ring} is +empty, @code{ring-remove} signals an error. +@end defun + +@defun ring-insert-at-beginning ring object +This inserts @var{object} into @var{ring}, treating it as the oldest +element. The return value is not significant. + +If the ring is full, this function removes the newest element to make +room for the inserted element. +@end defun + +@cindex fifo data structure + If you are careful not to exceed the ring size, you can +use the ring as a first-in-first-out queue. For example: + +@lisp +(let ((fifo (make-ring 5))) + (mapc (lambda (obj) (ring-insert fifo obj)) + '(0 one "two")) + (list (ring-remove fifo) t + (ring-remove fifo) t + (ring-remove fifo))) + @result{} (0 t one t "two") +@end lisp diff --git a/doc/lispref/strings.texi b/doc/lispref/strings.texi index 49199d3e32f..bbb75f1474d 100644 --- a/doc/lispref/strings.texi +++ b/doc/lispref/strings.texi @@ -410,8 +410,13 @@ in case if @code{case-fold-search} is non-@code{nil}. @defun string= string1 string2 This function returns @code{t} if the characters of the two strings match exactly. Symbols are also allowed as arguments, in which case -their print names are used. -Case is always significant, regardless of @code{case-fold-search}. +the symbol names are used. Case is always significant, regardless of +@code{case-fold-search}. + +This function is equivalent to @code{equal} for comparing two strings +(@pxref{Equality Predicates}). In particular, the text properties of +the two strings are ignored. But if either argument is not a string +or symbol, an error is signaled. @example (string= "abc" "abc") @@ -422,10 +427,6 @@ Case is always significant, regardless of @code{case-fold-search}. @result{} nil @end example -The function @code{string=} ignores the text properties of the two -strings. When @code{equal} (@pxref{Equality Predicates}) compares two -strings, it uses @code{string=}. - For technical reasons, a unibyte and a multibyte string are @code{equal} if and only if they contain the same sequence of character codes and all these codes are either in the range 0 through diff --git a/doc/lispref/symbols.texi b/doc/lispref/symbols.texi index 866a63c4cd9..0ee22b905b6 100644 --- a/doc/lispref/symbols.texi +++ b/doc/lispref/symbols.texi @@ -41,62 +41,58 @@ references another object: @table @asis @item Print name @cindex print name cell -The @dfn{print name cell} holds a string that names the symbol for -reading and printing. See @code{symbol-name} in @ref{Creating Symbols}. +The symbol's name. @item Value @cindex value cell -The @dfn{value cell} holds the current value of the symbol as a -variable. When a symbol is used as a form, the value of the form is the -contents of the symbol's value cell. See @code{symbol-value} in -@ref{Accessing Variables}. +The symbol's current value as a variable. @item Function @cindex function cell -The @dfn{function cell} holds the function definition of the symbol. -When a symbol is used as a function, its function definition is used in -its place. This cell is also used to make a symbol stand for a keymap -or a keyboard macro, for editor command execution. Because each symbol -has separate value and function cells, variables names and function names do -not conflict. See @code{symbol-function} in @ref{Function Cells}. +The symbol's function definition. It can also hold a symbol, a +keymap, or a keyboard macro. @item Property list @cindex property list cell -The @dfn{property list cell} holds the property list of the symbol. See -@code{symbol-plist} in @ref{Property Lists}. +The symbol's property list. @end table - The print name cell always holds a string, and cannot be changed. The -other three cells can be set individually to any specified Lisp object. - - The print name cell holds the string that is the name of the symbol. -Since symbols are represented textually by their names, it is important -not to have two symbols with the same name. The Lisp reader ensures -this: every time it reads a symbol, it looks for an existing symbol with -the specified name before it creates a new one. (In GNU Emacs Lisp, -this lookup uses a hashing algorithm and an obarray; see @ref{Creating -Symbols}.) - - The value cell holds the symbol's value as a variable -(@pxref{Variables}). That is what you get if you evaluate the symbol as -a Lisp expression (@pxref{Evaluation}). Any Lisp object is a legitimate -value. Certain symbols have values that cannot be changed; these -include @code{nil} and @code{t}, and any symbol whose name starts with -@samp{:} (those are called @dfn{keywords}). @xref{Constant Variables}. - - We often refer to ``the function @code{foo}'' when we really mean -the function stored in the function cell of the symbol @code{foo}. We -make the distinction explicit only when necessary. In normal -usage, the function cell usually contains a function -(@pxref{Functions}) or a macro (@pxref{Macros}), as that is what the -Lisp interpreter expects to see there (@pxref{Evaluation}). Keyboard -macros (@pxref{Keyboard Macros}), keymaps (@pxref{Keymaps}) and -autoload objects (@pxref{Autoloading}) are also sometimes stored in -the function cells of symbols. +@noindent +The print name cell always holds a string, and cannot be changed. +Each of the other three cells can be set to any Lisp object. + + The print name cell holds the string that is the name of a symbol. +Since symbols are represented textually by their names, it is +important not to have two symbols with the same name. The Lisp reader +ensures this: every time it reads a symbol, it looks for an existing +symbol with the specified name before it creates a new one. To get a +symbol's name, use the function @code{symbol-name} (@pxref{Creating +Symbols}). + + The value cell holds a symbol's value as a variable, which is what +you get if the symbol itself is evaluated as a Lisp expression. +@xref{Variables}, for details about how values are set and retrieved, +including complications such as @dfn{local bindings} and @dfn{scoping +rules}. Most symbols can have any Lisp object as a value, but certain +special symbols have values that cannot be changed; these include +@code{nil} and @code{t}, and any symbol whose name starts with +@samp{:} (those are called @dfn{keywords}). @xref{Constant +Variables}. + + The function cell holds a symbol's function definition. Often, we +refer to ``the function @code{foo}'' when we really mean the function +stored in the function cell of @code{foo}; we make the distinction +explicit only when necessary. Typically, the function cell is used to +hold a function (@pxref{Functions}) or a macro (@pxref{Macros}). +However, it can also be used to hold a symbol (@pxref{Function +Indirection}), keyboard macro (@pxref{Keyboard Macros}), keymap +(@pxref{Keymaps}), or autoload object (@pxref{Autoloading}). To get +the contents of a symbol's function cell, use the function +@code{symbol-function} (@pxref{Function Cells}). The property list cell normally should hold a correctly formatted -property list (@pxref{Property Lists}), as a number of functions expect -to see a property list there. +property list. To get a symbol's function cell, use the function +@code{symbol-plist}. @xref{Property Lists}. The function cell or the value cell may be @dfn{void}, which means that the cell does not reference any object. (This is not the same @@ -104,57 +100,43 @@ thing as holding the symbol @code{void}, nor the same as holding the symbol @code{nil}.) Examining a function or value cell that is void results in an error, such as @samp{Symbol's value as variable is void}. - The four functions @code{symbol-name}, @code{symbol-value}, -@code{symbol-plist}, and @code{symbol-function} return the contents of -the four cells of a symbol. Here as an example we show the contents of -the four cells of the symbol @code{buffer-file-name}: + Because each symbol has separate value and function cells, variables +names and function names do not conflict. For example, the symbol +@code{buffer-file-name} has a value (the name of the file being +visited in the current buffer) as well as a function definition (a +primitive function that returns the name of the file): @example -(symbol-name 'buffer-file-name) - @result{} "buffer-file-name" -(symbol-value 'buffer-file-name) +buffer-file-name @result{} "/gnu/elisp/symbols.texi" (symbol-function 'buffer-file-name) @result{} # -(symbol-plist 'buffer-file-name) - @result{} (variable-documentation 29529) @end example -@noindent -Because this symbol is the variable which holds the name of the file -being visited in the current buffer, the value cell contents we see are -the name of the source file of this chapter of the Emacs Lisp Manual. -The property list cell contains the list @code{(variable-documentation -29529)} which tells the documentation functions where to find the -documentation string for the variable @code{buffer-file-name} in the -@file{DOC-@var{version}} file. (29529 is the offset from the beginning -of the @file{DOC-@var{version}} file to where that documentation string -begins---see @ref{Documentation Basics}.) The function cell contains -the function for returning the name of the file. -@code{buffer-file-name} names a primitive function, which has no read -syntax and prints in hash notation (@pxref{Primitive Function Type}). A -symbol naming a function written in Lisp would have a lambda expression -(or a byte-code object) in this cell. - @node Definitions, Creating Symbols, Symbol Components, Symbols @section Defining Symbols @cindex definitions of symbols - A @dfn{definition} in Lisp is a special form that announces your -intention to use a certain symbol in a particular way. In Emacs Lisp, -you can define a symbol as a variable, or define it as a function (or -macro), or both independently. - - A definition construct typically specifies a value or meaning for the -symbol for one kind of use, plus documentation for its meaning when used -in this way. Thus, when you define a symbol as a variable, you can -supply an initial value for the variable, plus documentation for the -variable. + A @dfn{definition} is a special kind of Lisp expression that +announces your intention to use a symbol in a particular way. It +typically specifies a value or meaning for the symbol for one kind of +use, plus documentation for its meaning when used in this way. Thus, +when you define a symbol as a variable, you can supply an initial +value for the variable, plus documentation for the variable. @code{defvar} and @code{defconst} are special forms that define a -symbol as a global variable. They are documented in detail in -@ref{Defining Variables}. For defining user option variables that can -be customized, use @code{defcustom} (@pxref{Customization}). +symbol as a @dfn{global variable}---a variable that can be accessed at +any point in a Lisp program. @xref{Variables}, for details about +variables. To define a customizable variable, use the +@code{defcustom} macro, which also calls @code{defvar} as a subroutine +(@pxref{Customization}). + + In principle, you can assign a variable value to any symbol with +@code{setq}, whether not it has first been defined as a variable. +However, you ought to write a variable definition for each global +variable that you want to use; otherwise, your Lisp program may not +act correctly if it is evaluated with lexical scoping enabled +(@pxref{Variable Scoping}). @code{defun} defines a symbol as a function, creating a lambda expression and storing it in the function cell of the symbol. This @@ -171,15 +153,14 @@ both macro and function definitions are kept in the function cell, and that cell can hold only one Lisp object at any given time. @xref{Macros}. - In Emacs Lisp, a definition is not required in order to use a symbol -as a variable or function. Thus, you can make a symbol a global -variable with @code{setq}, whether you define it first or not. The real -purpose of definitions is to guide programmers and programming tools. -They inform programmers who read the code that certain symbols are -@emph{intended} to be used as variables, or as functions. In addition, -utilities such as @file{etags} and @file{make-docfile} recognize -definitions, and add appropriate information to tag tables and the -@file{DOC-@var{version}} file. @xref{Accessing Documentation}. + As previously noted, Emacs Lisp allows the same symbol to be defined +both as a variable (e.g.@: with @code{defvar}) and as a function or +macro (e.g.@: with @code{defun}). Such definitions do not conflict. + + These definition also act as guides for programming tools. For +example, the @kbd{C-h f} and @kbd{C-h v} commands create help buffers +containing links to the relevant variable, function, or macro +definitions. @xref{Name Help,,, emacs, The GNU Emacs Manual}. @node Creating Symbols, Property Lists, Definitions, Symbols @section Creating and Interning Symbols @@ -254,8 +235,8 @@ not work---only @code{intern} can enter a symbol in an obarray properly. @cindex CL note---symbol in obarrays @quotation -@b{Common Lisp note:} In Common Lisp, a single symbol may be interned in -several obarrays. +@b{Common Lisp note:} Unlike Common Lisp, Emacs Lisp does not provide +for interning a single symbol in several obarrays. @end quotation Most of the functions below take a name and sometimes an obarray as @@ -448,12 +429,13 @@ must be distinct. Property lists are better than association lists for attaching information to various Lisp function names or variables. If your -program keeps all of its associations in one association list, it will +program keeps all such information in one association list, it will typically need to search that entire list each time it checks for an -association. This could be slow. By contrast, if you keep the same -information in the property lists of the function names or variables -themselves, each search will scan only the length of one property list, -which is usually short. This is why the documentation for a variable is +association for a particular Lisp function name or variable, which +could be slow. By contrast, if you keep the same information in the +property lists of the function names or variables themselves, each +search will scan only the length of one property list, which is +usually short. This is why the documentation for a variable is recorded in a property named @code{variable-documentation}. The byte compiler likewise uses properties to record those functions needing special treatment. -- cgit v1.2.1 From 20d2304d18b31ed4de8a535f1a66defeeaa424a1 Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Mon, 23 Jan 2012 14:52:18 +0800 Subject: * doc/emacs/anti.texi (Antinews): Add Emacs 24 antinews. --- doc/emacs/ChangeLog | 4 +++ doc/emacs/anti.texi | 95 ++++++++++++++++++++++++++++++++++++++++++++++++++++- etc/NEWS | 10 +++--- 3 files changed, 103 insertions(+), 6 deletions(-) diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index 90a7f69ea72..8a461d2a366 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -1,3 +1,7 @@ +2012-01-23 Chong Yidong + + * anti.texi (Antinews): Add Emacs 24 antinews. + 2012-01-16 Volker Sobek (tiny change) * programs.texi (Comment Commands): Typo (bug#10514). diff --git a/doc/emacs/anti.texi b/doc/emacs/anti.texi index d9f17c91f5e..7bc405e442e 100644 --- a/doc/emacs/anti.texi +++ b/doc/emacs/anti.texi @@ -13,7 +13,100 @@ greater simplicity that results from the absence of many Emacs @itemize @bullet @item -FIXME +Support for displaying and editing ``bidirectional'' text has been +removed. Text is now always displayed on the screen in a single +consistent direction---left to right---regardless of the underlying +script. Similarly, @kbd{C-f} and @kbd{C-b} always move the text +cursor to the right and left respectively. Also, @key{right} and +@key{left} are now equivalent to @kbd{C-f} and @kbd{C-b}, as you might +expect, rather than moving forward or backward based on the underlying +``paragraph direction''. + +Users of ``right-to-left'' languages, like Arabic and Hebrew, may +adapt by reading and/or editing text in left-to-right order. + +@item +The Emacs Lisp package manager has been removed. Instead of using a +``user interface'' (@kbd{M-x list-packages}), additional Lisp packages +must now be installed by hand, which is the most flexible and +``Lispy'' method anyway. Typically, this just involves editing your +init file to add the package installation directory to the load path +and defining some autoloads; see each package's commentary section +and/or README file for details. + +@item +The option @code{delete-active-region} has been deleted. When the +region is active, typing @key{DEL} or @key{delete} no longer deletes +the text in the region; it deletes a single character instead. + +@item +We have reworked how Emacs handles the clipboard and the X primary +selection. Commands for killing and yanking, like @kbd{C-w} and +@kbd{C-y}, use the primary selection and not the clipboard, so you can +use these commands without interfering with ``cutting'' or ``pasting'' +in other programs. The @samp{Cut}/@samp{Copy}/@samp{Paste} menu items +are bound to separate clipboard commands, not to the same commands as +@kbd{C-w}/@kbd{M-w}/@kbd{C-y}. + +Selecting text by dragging with the mouse now puts the text in the +kill ring, in addition to the primary selection. But note that +selecting an active region with @kbd{C-@key{SPC}} does @emph{not} +alter the kill ring nor the primary selection, even though the text +highlighting is visually identical. + +@item +In Isearch, @kbd{C-y} and @kbd{M-y} are no longer bound to +@code{isearch-yank-kill} and @code{isearch-yank-pop} respectively. +Instead, @kbd{C-y} yanks the rest of the current line into the search +string (@code{isearch-yank-line}), whereas @kbd{M-y} does +@code{isearch-yank-kill}. The mismatch with the usual meanings of +@kbd{C-y} and @kbd{M-y} is unintended. + +@item +Various completion features have been simplified. The options +@code{completion-cycle-threshold} and +@code{completion-category-overrides} have been removed. Due to the +latter removal, Emacs uses a single consistent scheme to generate +completions, instead of using a separate scheme for (say) buffer name +completion. Several major modes, such as Shell mode, now implement +their own inline completion commands instead of using +@code{completion-at-point}. + +@item +We have removed various options for controlling how windows are used, +e.g.@: @code{display-buffer-base-action}, @code{display-buffer-alist}, +@code{window-combination-limit}, and @code{window-combination-resize}. + +@item +The command @kbd{M-x customize-themes} has been removed. Emacs no +longer comes with pre-defined themes (you can write your own). + +@item +Emacs no longer adapts various aspects of its display to GTK+ +settings, opting instead for a uniform toolkit-independent look. GTK+ +scroll bars are placed on the left, the same position as non-GTK+ X +scroll bars. Emacs no longer refers to GTK+ to set the default +@code{region} face, nor for drawing tooltips. + +@item +Setting the option @code{delete-by-moving-to-trash} to a +non-@code{nil} now causes all file deletions to use the system trash, +even temporary files created by Lisp programs; furthermore, the +@kbd{M-x delete-file} and @kbd{M-x delete-directory} commands no +longer accept prefix arguments to force true deletion. + +@item +On GNU/Linux and Unix, the default method for sending mail (as +specified by @code{send-mail-function}) is to use the +@command{sendmail} program. Emacs no longer asks for a delivery +method the first time you try to send mail, trusting instead that the +system is configured for mail delivery, as it ought to be. + +@item +Several VC features have been removed, including the @kbd{C-x v +} and +@kbd{C-x v m} commands for pulling and merging on distributed version +control systems, and the ability to view inline log entries in the log +buffers made by @kbd{C-x v L}. @item To keep up with decreasing computer memory capacity and disk space, many diff --git a/etc/NEWS b/etc/NEWS index f745645d6fb..ccf2441c656 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -430,11 +430,6 @@ These maximize and minimize the size of a window within its frame. These functions allow to navigate through the live buffers that have been shown in a specific window. -+++ -*** New functions `window-state-get' and `window-state-put'. -These functions allow to save and restore the state of an arbitrary -frame or window as an Elisp object. - ** The inactive minibuffer has its own major mode `minibuffer-inactive-mode'. This is handy for minibuffer-only frames, and is also used for the "mouse-1 pops up *Messages*" feature, which can now easily be changed. @@ -1161,6 +1156,11 @@ state before the last buffer display operation in that window. iconifying or deleting a frame when burying a buffer shown in a dedicated frame or quitting a window showing a buffer in a frame of its own. ++++ +*** New functions `window-state-get' and `window-state-put'. +These functions allow to save and restore the state of an arbitrary +frame or window as an Elisp object. + ** Completion *** New variable completion-extra-properties used to specify extra properties -- cgit v1.2.1 From f088cb8b2feeea6989e1491029096e0c35577f06 Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Mon, 23 Jan 2012 14:54:20 +0800 Subject: Fix last change. --- doc/emacs/ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index 8a461d2a366..9aa4899e591 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -1,6 +1,6 @@ 2012-01-23 Chong Yidong - * anti.texi (Antinews): Add Emacs 24 antinews. + * anti.texi (Antinews): Add Emacs 23 antinews. 2012-01-16 Volker Sobek (tiny change) -- cgit v1.2.1 From 802a2ae21ff07fa801aa8de843a9b9d496fb459a Mon Sep 17 00:00:00 2001 From: Mike Lamb Date: Mon, 23 Jan 2012 00:12:10 -0800 Subject: Handle comments in eshell-read-hosts-file (tiny change) * lisp/eshell/esh-util.el (eshell-read-hosts-file): Skip comment lines. Fixes: debbugs:10549 --- lisp/ChangeLog | 5 +++++ lisp/eshell/esh-util.el | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 96c18714709..297043fa12b 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2012-01-23 Mike Lamb (tiny change) + + * eshell/esh-util.el (eshell-read-hosts-file): + Skip comment lines. (Bug#10549) + 2012-01-23 Juanma Barranquero * subr.el (display-delayed-warnings): Doc fix. diff --git a/lisp/eshell/esh-util.el b/lisp/eshell/esh-util.el index f111fd91230..8218e91ddc7 100644 --- a/lisp/eshell/esh-util.el +++ b/lisp/eshell/esh-util.el @@ -483,7 +483,7 @@ list." (insert-file-contents eshell-hosts-file) (goto-char (point-min)) (while (re-search-forward - "^\\(\\S-+\\)\\s-+\\(\\S-+\\)\\(\\s-*\\(\\S-+\\)\\)?" nil t) + "^\\([^#[:space:]]+\\)\\s-+\\(\\S-+\\)\\(\\s-*\\(\\S-+\\)\\)?" nil t) (if (match-string 1) (add-to-list 'hosts (match-string 1))) (if (match-string 2) -- cgit v1.2.1 From d7128bb16449d0b4f0d9735bed049cf5e03d61e9 Mon Sep 17 00:00:00 2001 From: Mike Lamb Date: Mon, 23 Jan 2012 00:18:22 -0800 Subject: * lisp/eshell/esh-util.el (pcomplete/ssh): Remove alias. (tiny change) There is a better pcomplete/ssh defined in pcmpl-unix.el. Fixes: debbugs:10548 --- lisp/ChangeLog | 2 ++ lisp/eshell/em-unix.el | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 297043fa12b..97281db4c7c 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -3,6 +3,8 @@ * eshell/esh-util.el (eshell-read-hosts-file): Skip comment lines. (Bug#10549) + * eshell/em-unix.el (pcomplete/ssh): Remove. (Bug#10548) + 2012-01-23 Juanma Barranquero * subr.el (display-delayed-warnings): Doc fix. diff --git a/lisp/eshell/em-unix.el b/lisp/eshell/em-unix.el index f24180b5c7f..296e2ee8b24 100644 --- a/lisp/eshell/em-unix.el +++ b/lisp/eshell/em-unix.el @@ -792,8 +792,6 @@ external command." (funcall (or (pcomplete-find-completion-function (pcomplete-arg 1)) pcomplete-default-completion-function))) -(defalias 'pcomplete/ssh 'pcomplete/rsh) - (defvar block-size) (defvar by-bytes) (defvar dereference-links) -- cgit v1.2.1 From b8fe8712d0050b8192ca0e881c5f8b5b69b30f84 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Mon, 23 Jan 2012 00:38:22 -0800 Subject: * pcl-cvs.texi (About PCL-CVS): Refer to vc-dir rather than vc-dired. --- doc/misc/ChangeLog | 4 ++++ doc/misc/pcl-cvs.texi | 10 ++++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index 9c29473e99d..72ac8b85fc3 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -1,3 +1,7 @@ +2012-01-23 Glenn Morris + + * pcl-cvs.texi (About PCL-CVS): Refer to vc-dir rather than vc-dired. + 2012-01-19 Eric Hanchrow * tramp.texi (File): Tweak wording for the `scpc' option. diff --git a/doc/misc/pcl-cvs.texi b/doc/misc/pcl-cvs.texi index 32d2114f5a0..92c309f5e98 100644 --- a/doc/misc/pcl-cvs.texi +++ b/doc/misc/pcl-cvs.texi @@ -6,8 +6,7 @@ @c %**end of header @copying -Copyright @copyright{} 1991-2012 -Free Software Foundation, Inc. +Copyright @copyright{} 1991-2012 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document @@ -136,10 +135,9 @@ Customization PCL-CVS is a front-end to CVS versions 1.9 and later. It concisely shows the present status of a checked out module in an Emacs buffer and provides single-key access to the most frequently used CVS -commands. -For Emacs users accustomed to VC, PCL-CVS can be thought of as a replacement -for VC-dired (@pxref{VC Directory Mode, , , emacs, The GNU -Emacs Manual}) specifically designed for CVS. +commands. Note that the @code{vc-dir} command (@pxref{VC Directory +Mode, , , emacs, The GNU Emacs Manual}) provides similar +functionality, but for several version control systems, including CVS. PCL-CVS was originally written many years ago by Per Cederqvist who proudly maintained it until January 1996, at which point he released the -- cgit v1.2.1 From cb5850f27c1b4d26957d58e2da2314dd12498671 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Mon, 23 Jan 2012 00:45:59 -0800 Subject: Replace vc-dired references in comments with vc-dir. --- lisp/vc/pcvs.el | 16 ++++++++-------- lisp/vc/vc-dav.el | 5 +---- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/lisp/vc/pcvs.el b/lisp/vc/pcvs.el index 1066ebc7f81..9ba65cda143 100644 --- a/lisp/vc/pcvs.el +++ b/lisp/vc/pcvs.el @@ -31,19 +31,19 @@ ;;; Commentary: -;; PCL-CVS is a front-end to the CVS version control system. For people -;; familiar with VC, it is somewhat like VC-dired: it presents the status of -;; all the files in your working area and allows you to commit/update several -;; of them at a time. Compared to VC-dired, it is considerably better and -;; faster (but only for CVS). +;; PCL-CVS is a front-end to the CVS version control system. +;; It presents the status of all the files in your working area and +;; allows you to commit/update several of them at a time. +;; Compare with the general Emacs utility vc-dir, which tries +;; to be VCS-agnostic. You may find PCL-CVS better/faster for CVS. ;; PCL-CVS was originally written by Per Cederqvist many years ago. This ;; version derives from the XEmacs-21 version, itself based on the 2.0b2 ;; version (last release from Per). It is a thorough rework. -;; Contrary to what you'd expect, PCL-CVS is not a replacement for VC but only -;; for VC-dired. As such, I've tried to make PCL-CVS and VC interoperate -;; seamlessly (I also use VC). +;; PCL-CVS is not a replacement for VC, but adds extra functionality. +;; As such, I've tried to make PCL-CVS and VC interoperate seamlessly +;; (I also use VC). ;; To use PCL-CVS just use `M-x cvs-examine RET RET'. ;; There is a TeXinfo manual, which can be helpful to get started. diff --git a/lisp/vc/vc-dav.el b/lisp/vc/vc-dav.el index 6f9a6d6b7df..9d55e9c7b43 100644 --- a/lisp/vc/vc-dav.el +++ b/lisp/vc/vc-dav.el @@ -170,10 +170,7 @@ It should return a status of either 0 (no differences found), or ;; Return a dav-specific mode line string for URL. Are there any ;; specific states that we want exposed? ;; -;; vc-dav-dired-state-info(url) -;; Translate the `vc-state' property of URL into a string that can -;; be used in a vc-dired buffer. Are there any extra states that -;; we want exposed? +;; vc-dir support ;; ;; vc-dav-receive-file(url rev) ;; Let this backend `receive' a file that is already registered -- cgit v1.2.1