commit f8f73570a89975fabb587b490b3ccb6a40e8aee1 (HEAD, refs/remotes/origin/master) Author: Paul Eggert Date: Sun Dec 14 00:59:32 2014 -0800 * notes/unicode: Correct coding system of lisp/international/titdic-cnv.el. diff --git a/admin/ChangeLog b/admin/ChangeLog index ae84460..88ce145 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog @@ -1,6 +1,8 @@ 2014-12-14 Paul Eggert * notes/unicode: Track leim/quail file renames. + Correct coding system + of lisp/international/titdic-cnv.el. 2014-12-14 Glenn Morris diff --git a/admin/notes/unicode b/admin/notes/unicode index 12454f8..8ec5669 100644 --- a/admin/notes/unicode +++ b/admin/notes/unicode @@ -228,11 +228,15 @@ nontrivial changes to the build process. lisp/leim/quail/pypunct-b5.el lisp/term/x-win.el + This file contains just Chinese characters, and has same problem. + Also, it contains characters that cannot be encoded in UTF-8. + + lisp/international/titdic-cnv.el + * utf-8-emacs These files contain characters that cannot be encoded in UTF-8. - lisp/international/titdic-cnv.el lisp/language/tibetan.el lisp/language/tibet-util.el lisp/language/ind-util.el commit 472f7f6481346d563b246655cba11fd8ca893ea2 Author: Paul Eggert Date: Sun Dec 14 00:56:40 2014 -0800 * SKK-DIC/SKK-JISYO.L: Update to version 1.1216. diff --git a/leim/ChangeLog b/leim/ChangeLog index 93c3386..eeffc8a 100644 --- a/leim/ChangeLog +++ b/leim/ChangeLog @@ -1,3 +1,7 @@ +2014-12-14 Paul Eggert + + * SKK-DIC/SKK-JISYO.L: Update to version 1.1216. + 2014-10-20 Glenn Morris * Merge in all changes up to 24.4 release. diff --git a/leim/SKK-DIC/SKK-JISYO.L b/leim/SKK-DIC/SKK-JISYO.L index e81ccde..44d8644 100644 --- a/leim/SKK-DIC/SKK-JISYO.L +++ b/leim/SKK-DIC/SKK-JISYO.L @@ -13,9 +13,9 @@ ;; SKK Development Team ;; ;; Maintainer: SKK Development Team -;; Version: $Id: SKK-JISYO.L,v 1.1164 2013/12/21 00:10:02 czkmt Exp $ +;; Version: $Id: SKK-JISYO.L,v 1.1216 2014/12/13 00:10:02 czkmt Exp $ ;; Keywords: japanese -;; Last Modified: $Date: 2013/12/21 00:10:02 $ +;; Last Modified: $Date: 2014/12/13 00:10:02 $ ;; ;; This dictionary is free software; you can redistribute it and/or ;; modify it under the terms of the GNU General Public License as @@ -53846,7 +53846,7 @@ zyklus / えにっき /絵日記/ えにわ /恵庭/ えぬえちけいほーる /ＮＨＫホール/ -えぬかっけい / n 角形/ +えぬかっけい /Ｎ角形/ えぬきょう /Ｎ響/ えぬきょく /Ｎ極/N極;north pole. 「方位磁針の-」/ えぬこ /Ｎ個/ @@ -69555,7 +69555,7 @@ zyklus / きばん /基盤;†base.「社会-」/基板;†board.「PCの-」/機番/ きばんがい /基板外/ きばんこうかん /基盤交換/ -きばんごう /記番号;(concat "http:057057www.boj.or.jp057oshiete057money05705200002.htm")/ +きばんごう /記番号;(concat "http:\057\057www.boj.or.jp\057announcements\057education\057oshiete\057money\057c14.htm\057")/ きばんし /生半紙/ きばんじょう /基板上/基盤上/ きばんせいび /基盤整備/ @@ -80531,7 +80531,7 @@ zyklus / げんわかやま /現和歌山/ げんわく /幻惑/眩惑/ げんわくてき /幻惑的/ -こ /子/小/個/故/古/粉/弧;arc/湖/庫/戸/固/箇;(助数詞) =個/个;(助数詞) =個,箇/ヶ;(助数詞) 「個」の略字/仔;動物の子/児/兒;「児」の旧字(人名用漢字)/娘;当て字/女/呼;呼称/乎;断乎/姑;しゅうとめ/枯;枯死/胡;呼吸/鈷;独鈷/估/沽;沽券/怙;依怙贔屓/罟;あみ/蛄;螻蛄(けら)/詁;訓詁/鴣;鷓鴣(しゃこ)/糊;のり/瑚;珊瑚/楜/葫;にんにく/蝴;蝴蝶/餬;餬口/凅;こおる/涸;涸渇/痼;しこり/錮;禁錮/孤;lone/狐;fox/菰;こも/呱;呱々(赤子の泣き声)/柧;さかづき/觚;操觚/虎;とら/乕;「虎」の異体字/琥;琥珀/虍;とらかんむり/來;「来」の旧字(人名用漢字)/徠;「来」の異体字/壺;つぼ/壷;「壺」の異体字/雇;雇用/顧;顧問/鼓/皷;「鼓」の異体字/瞽;めくら/扈;跋扈/滬;上海の略称/袴;はかま/誇;誇示/跨;また・ぐ/刳;えぐ・る/夸/桍/瓠;瓢箪/胯;また/冴;さ・える/冱;「冴」の異体字/拠;根拠/股;また/賈;書賈/滸;水滸伝/箍;たが/蠱;蠱惑的/辜;無辜/粐;NB:幽霊字の一つ/己;自己/杞;(呉音) 杞憂/去;(呉音)去年(こぞ)/虚;(呉音)虚空/炬;(慣用音)炬燵/木;木立/黄;黄金色/来;動詞活用形?/⌒;arc/濃;動詞語幹?/濾;動詞語幹?/ +こ /子/小/個/故/古/粉/弧;arc/湖/庫/戸/固/箇;(助数詞) =個/个;(助数詞) =個,箇/ヶ;(助数詞) 「個」の略字/仔;動物の子/児/兒;「児」の旧字(人名用漢字)/娘;当て字/女/呼;呼称/乎;断乎/姑;しゅうとめ/枯;枯死/胡;胡弓/鈷;独鈷/估/沽;沽券/怙;依怙贔屓/罟;あみ/蛄;螻蛄(けら)/詁;訓詁/鴣;鷓鴣(しゃこ)/糊;のり/瑚;珊瑚/楜/葫;にんにく/蝴;蝴蝶/餬;餬口/凅;こおる/涸;涸渇/痼;しこり/錮;禁錮/孤;lone/狐;fox/菰;こも/呱;呱々(赤子の泣き声)/柧;さかづき/觚;操觚/虎;とら/乕;「虎」の異体字/琥;琥珀/虍;とらかんむり/來;「来」の旧字(人名用漢字)/徠;「来」の異体字/壺;つぼ/壷;「壺」の異体字/雇;雇用/顧;顧問/鼓/皷;「鼓」の異体字/瞽;めくら/扈;跋扈/滬;上海の略称/袴;はかま/誇;誇示/跨;また・ぐ/刳;えぐ・る/夸/桍/瓠;瓢箪/胯;また/冴;さ・える/冱;「冴」の異体字/拠;根拠/股;また/賈;書賈/滸;水滸伝/箍;たが/蠱;蠱惑的/辜;無辜/粐;NB:幽霊字の一つ/己;自己/杞;(呉音) 杞憂/去;(呉音)去年(こぞ)/虚;(呉音)虚空/炬;(慣用音)炬燵/木;木立/黄;黄金色/来;動詞活用形?/⌒;arc/濃;動詞語幹?/濾;動詞語幹?/ こ> /小;small/子;(child) 子羊,子ライオン,子メーター/仔;(動物の子) 仔猫/故;late/古;(old) 古伊万里/孤;(lone) 孤月,孤蝶/ こーかさす /高加索/ こーすじょう /コース上/ @@ -138286,7 +138286,7 @@ zyklus / にじきおく /二次記憶/ にじきおくそうち /二次記憶装置/ にじきょくせん /二次曲線/ -にじきょくめん /２次曲面/ 2 次曲面/ +にじきょくめん /２次曲面/2次曲面/ にじく /二軸/ にじくけっしょう /二軸結晶/ にじけい /2次系/ commit 3de474e4ac7418d06b9f37489f939a16d9bde1c2 Author: Paul Eggert Date: Sat Dec 13 23:40:04 2014 -0800 Spelling fixes All uses changed. * lib-src/etags.c (analyze_regex): Rename from analyse_regex. * lisp/cedet/semantic/lex-spp.el: (semantic-lex-spp-analyzer-do-replace): Rename from semantic-lex-spp-anlyzer-do-replace. * lisp/emacs-lisp/cconv.el (cconv--analyze-use): Rename from cconv--analyse-use. (cconv--analyze-function): Rename from cconv--analyse-function. (cconv-analyze-form): Rename from cconv-analyse-form. * src/regex.c (analyze_first): Rename from analyze_first. diff --git a/ChangeLog b/ChangeLog index 130e587..718a958 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +2014-12-14 Paul Eggert + + Spelling fixes + All uses changed. + * lib-src/etags.c (analyze_regex): Rename from analyse_regex. + * lisp/cedet/semantic/lex-spp.el: + (semantic-lex-spp-analyzer-do-replace): + Rename from semantic-lex-spp-anlyzer-do-replace. + * lisp/emacs-lisp/cconv.el (cconv--analyze-use): + Rename from cconv--analyse-use. + (cconv--analyze-function): Rename from cconv--analyse-function. + (cconv-analyze-form): Rename from cconv-analyse-form. + * src/regex.c (analyze_first): Rename from analyze_first. + 2014-12-14 Glenn Morris * make-dist: No more lib-src/grep-changelog. diff --git a/etc/TERMS b/etc/TERMS index 316d902..84eb46f 100644 --- a/etc/TERMS +++ b/etc/TERMS @@ -72,7 +72,7 @@ is `cS', which I invented. correct parameter conventions from what would make the VT-100's `cs' string work properly. From an incorrect assumption about %i, I reached an incorrect conclusion about `cs', but the result - worked correctly on the VT100 and ANSII terminals. In Emacs + worked correctly on the VT100 and ANSI terminals. In Emacs version 17, both `cs' and %i work correctly. The version 16 convention was to pass, for the second parameter, diff --git a/etc/refcards/sk-refcard.tex b/etc/refcards/sk-refcard.tex index 07cccca..a787018 100644 --- a/etc/refcards/sk-refcard.tex +++ b/etc/refcards/sk-refcard.tex @@ -7,7 +7,7 @@ % Czech translation: Jan Buchal , January 1999 % Milan Zamazal , August 1999 % Pavel Jan鱈k , November 2000 (Emacs 21) -% Slozak translation: Miroslav Va邸ko , March 2001 +% Slovak translation: Miroslav Va邸ko , March 2001 % This file is part of GNU Emacs. diff --git a/lib-src/etags.c b/lib-src/etags.c index 84ed03e..6639ac4 100644 --- a/lib-src/etags.c +++ b/lib-src/etags.c @@ -314,7 +314,7 @@ static long readline_internal (linebuffer *, FILE *); static bool nocase_tail (const char *); static void get_tag (char *, char **); -static void analyse_regex (char *); +static void analyze_regex (char *); static void free_regexps (void); static void regex_tag_multiline (void); static void error (const char *, ...) ATTRIBUTE_FORMAT_PRINTF (1, 2); @@ -1207,7 +1207,7 @@ main (int argc, char **argv) lang = argbuffer[i].lang; break; case at_regexp: - analyse_regex (argbuffer[i].what); + analyze_regex (argbuffer[i].what); break; case at_filename: this_file = argbuffer[i].what; @@ -5573,7 +5573,7 @@ scan_separators (char *name) /* Look at the argument of --regex or --no-regex and do the right thing. Same for each line of a regexp file. */ static void -analyse_regex (char *regex_arg) +analyze_regex (char *regex_arg) { if (regex_arg == NULL) { @@ -5604,7 +5604,7 @@ analyse_regex (char *regex_arg) pfatal (regexfile); linebuffer_init (®exbuf); while (readline_internal (®exbuf, regexfp) > 0) - analyse_regex (regexbuf.buffer); + analyze_regex (regexbuf.buffer); free (regexbuf.buffer); fclose (regexfp); } diff --git a/lisp/cedet/semantic/lex-spp.el b/lisp/cedet/semantic/lex-spp.el index 67f944a..164454c 100644 --- a/lisp/cedet/semantic/lex-spp.el +++ b/lisp/cedet/semantic/lex-spp.el @@ -823,7 +823,7 @@ ARGVALUES are values for any arg list, or nil." ;; An analyzer that will push tokens from a macro in place ;; of the macro symbol. ;; -(defun semantic-lex-spp-anlyzer-do-replace (sym val beg end) +(defun semantic-lex-spp-analyzer-do-replace (sym val beg end) "Do the lexical replacement for SYM with VAL. Argument BEG and END specify the bounds of SYM in the buffer." (if (not val) @@ -863,6 +863,9 @@ Argument BEG and END specify the bounds of SYM in the buffer." (setq semantic-lex-end-point end) ) )) +(define-obsolete-function-alias + 'semantic-lex-spp-anlyzer-do-replace + 'semantic-lex-spp-analyzer-do-replace "25.1") (defvar semantic-lex-spp-replacements-enabled t "Non-nil means do replacements when finding keywords. diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el index e0cdd33..13b9f93 100644 --- a/lisp/emacs-lisp/bytecomp.el +++ b/lisp/emacs-lisp/bytecomp.el @@ -417,7 +417,7 @@ specify different fields to sort on." This list lives partly on the stack.") (defvar byte-compile-lexical-variables nil "List of variables that have been treated as lexical. -Filled in `cconv-analyse-form' but initialized and consulted here.") +Filled in `cconv-analyze-form' but initialized and consulted here.") (defvar byte-compile-const-variables nil "List of variables declared as constants during compilation of this file.") (defvar byte-compile-free-references) diff --git a/lisp/emacs-lisp/cconv.el b/lisp/emacs-lisp/cconv.el index 98eef11..3e17e38 100644 --- a/lisp/emacs-lisp/cconv.el +++ b/lisp/emacs-lisp/cconv.el @@ -30,13 +30,13 @@ ;; All macros should be expanded beforehand. ;; ;; Here is a brief explanation how this code works. -;; Firstly, we analyze the tree by calling cconv-analyse-form. +;; Firstly, we analyze the tree by calling cconv-analyze-form. ;; This function finds all mutated variables, all functions that are suitable ;; for lambda lifting and all variables captured by closure. It passes the tree ;; once, returning a list of three lists. ;; ;; Then we calculate the intersection of the first and third lists returned by -;; cconv-analyse form to find all mutated variables that are captured by +;; cconv-analyze form to find all mutated variables that are captured by ;; closure. ;; Armed with this data, we call cconv-closure-convert-rec, that rewrites the @@ -140,7 +140,7 @@ Returns a form where all lambdas don't have any free variables." (cconv-lambda-candidates '()) (cconv-captured+mutated '())) ;; Analyze form - fill these variables with new information. - (cconv-analyse-form form '()) + (cconv-analyze-form form '()) (setq cconv-freevars-alist (nreverse cconv-freevars-alist)) (prog1 (cconv-convert form nil nil) ; Env initially empty. (cl-assert (null cconv-freevars-alist))))) @@ -152,7 +152,7 @@ Returns a form where all lambdas don't have any free variables." (cconv-lambda-candidates '()) (cconv-captured+mutated '())) ;; Analyze form - fill these variables with new information. - (cconv-analyse-form form '()) + (cconv-analyze-form form '()) ;; But don't perform the closure conversion. form)) @@ -525,7 +525,7 @@ places where they originally did not directly appear." (defalias 'byte-compile-not-lexical-var-p 'boundp)) (defvar byte-compile-lexical-variables) -(defun cconv--analyse-use (vardata form varkind) +(defun cconv--analyze-use (vardata form varkind) "Analyze the use of a variable. VARDATA should be (BINDER READ MUTATED CAPTURED CALLED). VARKIND is the name of the kind of variable. @@ -557,7 +557,7 @@ FORM is the parent form that binds this var." (`(,(and binder `(,_ (function (lambda . ,_)))) nil nil nil t) (push (cons binder form) cconv-lambda-candidates)))) -(defun cconv--analyse-function (args body env parentform) +(defun cconv--analyze-function (args body env parentform) (let* ((newvars nil) (freevars (list body)) ;; We analyze the body within a new environment where all uses are @@ -582,10 +582,10 @@ FORM is the parent form that binds this var." (push (cons (list arg) (cdr varstruct)) newvars) (push varstruct newenv))))) (dolist (form body) ;Analyze body forms. - (cconv-analyse-form form newenv)) + (cconv-analyze-form form newenv)) ;; Summarize resulting data about arguments. (dolist (vardata newvars) - (cconv--analyse-use vardata parentform "argument")) + (cconv--analyze-use vardata parentform "argument")) ;; Transfer uses collected in `envcopy' (via `newenv') back to `env'; ;; and compute free variables. (while env @@ -601,7 +601,7 @@ FORM is the parent form that binds this var." (setf (nth 3 (car env)) t)) (setq env (cdr env) envcopy (cdr envcopy)))))) -(defun cconv-analyse-form (form env) +(defun cconv-analyze-form (form env) "Find mutated variables and variables captured by closure. Analyze lambdas if they are suitable for lambda lifting. - FORM is a piece of Elisp code after macroexpansion. @@ -628,7 +628,7 @@ and updates the data stored in ENV." (setq var (car binder)) (setq value (cadr binder)) - (cconv-analyse-form value (if (eq letsym 'let*) env orig-env))) + (cconv-analyze-form value (if (eq letsym 'let*) env orig-env))) (unless (byte-compile-not-lexical-var-p var) (cl-pushnew var byte-compile-lexical-variables) @@ -637,13 +637,13 @@ and updates the data stored in ENV." (push varstruct env)))) (dolist (form body-forms) ; Analyze body forms. - (cconv-analyse-form form env)) + (cconv-analyze-form form env)) (dolist (vardata newvars) - (cconv--analyse-use vardata form "variable")))) + (cconv--analyze-use vardata form "variable")))) (`(function (lambda ,vrs . ,body-forms)) - (cconv--analyse-function vrs body-forms env form)) + (cconv--analyze-function vrs body-forms env form)) (`(setq . ,forms) ;; If a local variable (member of env) is modified by setq then @@ -651,7 +651,7 @@ and updates the data stored in ENV." (while forms (let ((v (assq (car forms) env))) ; v = non nil if visible (when v (setf (nth 2 v) t))) - (cconv-analyse-form (cadr forms) env) + (cconv-analyze-form (cadr forms) env) (setq forms (cddr forms)))) (`((lambda . ,_) . ,_) ; First element is lambda expression. @@ -659,11 +659,11 @@ and updates the data stored in ENV." (format "Use of deprecated ((lambda %s ...) ...) form" (nth 1 (car form))) t :warning) (dolist (exp `((function ,(car form)) . ,(cdr form))) - (cconv-analyse-form exp env))) + (cconv-analyze-form exp env))) (`(cond . ,cond-forms) ; cond special form (dolist (forms cond-forms) - (dolist (form forms) (cconv-analyse-form form env)))) + (dolist (form forms) (cconv-analyze-form form env)))) (`(quote . ,_) nil) ; quote form (`(function . ,_) nil) ; same as quote @@ -672,13 +672,13 @@ and updates the data stored in ENV." (guard byte-compile--use-old-handlers)) ;; FIXME: The bytecode for condition-case forces us to wrap the ;; form and handlers in closures. - (cconv--analyse-function () (list protected-form) env form) + (cconv--analyze-function () (list protected-form) env form) (dolist (handler handlers) - (cconv--analyse-function (if var (list var)) (cdr handler) + (cconv--analyze-function (if var (list var)) (cdr handler) env form))) (`(condition-case ,var ,protected-form . ,handlers) - (cconv-analyse-form protected-form env) + (cconv-analyze-form protected-form env) (when (and var (symbolp var) (byte-compile-not-lexical-var-p var)) (byte-compile-log-warning (format "Lexical variable shadows the dynamic variable %S" var))) @@ -686,21 +686,21 @@ and updates the data stored in ENV." (if var (push varstruct env)) (dolist (handler handlers) (dolist (form (cdr handler)) - (cconv-analyse-form form env))) - (if var (cconv--analyse-use (cons (list var) (cdr varstruct)) + (cconv-analyze-form form env))) + (if var (cconv--analyze-use (cons (list var) (cdr varstruct)) form "variable")))) ;; FIXME: The bytecode for unwind-protect forces us to wrap the unwind. (`(,(or (and `catch (guard byte-compile--use-old-handlers)) `unwind-protect) ,form . ,body) - (cconv-analyse-form form env) - (cconv--analyse-function () body env form)) + (cconv-analyze-form form env) + (cconv--analyze-function () body env form)) (`(defvar ,var) (push var byte-compile-bound-variables)) (`(,(or `defconst `defvar) ,var ,value . ,_) (push var byte-compile-bound-variables) - (cconv-analyse-form value env)) + (cconv-analyze-form value env)) (`(,(or `funcall `apply) ,fun . ,args) ;; Here we ignore fun because funcall and apply are the only two @@ -710,8 +710,8 @@ and updates the data stored in ENV." (let ((fdata (and (symbolp fun) (assq fun env)))) (if fdata (setf (nth 4 fdata) t) - (cconv-analyse-form fun env))) - (dolist (form args) (cconv-analyse-form form env))) + (cconv-analyze-form fun env))) + (dolist (form args) (cconv-analyze-form form env))) (`(interactive . ,forms) ;; These appear within the function body but they don't have access @@ -719,19 +719,20 @@ and updates the data stored in ENV." ;; We could extend this to allow interactive specs to refer to ;; variables in the function's enclosing environment, but it doesn't ;; seem worth the trouble. - (dolist (form forms) (cconv-analyse-form form nil))) + (dolist (form forms) (cconv-analyze-form form nil))) ;; `declare' should now be macro-expanded away (and if they're not, we're ;; in trouble because they *can* contain code nowadays). ;; (`(declare . ,_) nil) ;The args don't contain code. (`(,_ . ,body-forms) ; First element is a function or whatever. - (dolist (form body-forms) (cconv-analyse-form form env))) + (dolist (form body-forms) (cconv-analyze-form form env))) ((pred symbolp) (let ((dv (assq form env))) ; dv = declared and visible (when dv (setf (nth 1 dv) t)))))) +(define-obsolete-function-alias 'cconv-analyse-form 'cconv-analyze-form "25.1") (provide 'cconv) ;;; cconv.el ends here diff --git a/lisp/gnus/gnus-bookmark.el b/lisp/gnus/gnus-bookmark.el index 91d5c76..e5d218e 100644 --- a/lisp/gnus/gnus-bookmark.el +++ b/lisp/gnus/gnus-bookmark.el @@ -251,7 +251,7 @@ So the cdr of each bookmark is an alist too.") (interactive) (save-excursion (save-window-excursion - ;; Avoir warnings? + ;; Avoid warnings? ;; (message "Saving Gnus bookmarks to file %s..." gnus-bookmark-default-file) (set-buffer (get-buffer-create " *Gnus bookmarks*")) (erase-buffer) diff --git a/lisp/org/org-table.el b/lisp/org/org-table.el index f28e96c..8c9a83d 100644 --- a/lisp/org/org-table.el +++ b/lisp/org/org-table.el @@ -2351,7 +2351,7 @@ For all numbers larger than LIMIT, shift them by DELTA." (string-match "^[a-zA-Z][_a-zA-Z0-9]*$" field)) (push (cons field v) org-table-local-parameters) (push (list field line col) org-table-named-field-locations)))) - ;; Analyse the line types + ;; Analyze the line types. (goto-char beg) (setq org-table-current-begin-line (org-current-line) org-table-current-begin-pos (point) diff --git a/lisp/org/org.el b/lisp/org/org.el index 78536eb..2b7c947 100644 --- a/lisp/org/org.el +++ b/lisp/org/org.el @@ -19148,7 +19148,7 @@ BEG and END default to the buffer boundaries." (org-defkey org-mode-map "\C-c\M-f" 'org-next-block) (org-defkey org-mode-map "\C-c\M-b" 'org-previous-block) (org-defkey org-mode-map "\C-c$" 'org-archive-subtree) -(org-defkey org-mode-map "\C-c\C-x\C-s" 'org-advertized-archive-subtree) +(org-defkey org-mode-map "\C-c\C-x\C-s" 'org-archive-subtree) (org-defkey org-mode-map "\C-c\C-x\C-a" 'org-archive-subtree-default) (org-defkey org-mode-map "\C-c\C-xd" 'org-insert-drawer) (org-defkey org-mode-map "\C-c\C-xa" 'org-toggle-archive-tag) @@ -20943,7 +20943,7 @@ on context. See the individual commands for more information." ("Archive" ["Archive (default method)" org-archive-subtree-default (org-in-subtree-not-table-p)] "--" - ["Move Subtree to Archive file" org-advertized-archive-subtree (org-in-subtree-not-table-p)] + ["Move Subtree to Archive file" org-archive-subtree (org-in-subtree-not-table-p)] ["Toggle ARCHIVE tag" org-toggle-archive-tag (org-in-subtree-not-table-p)] ["Move subtree to Archive sibling" org-archive-to-archive-sibling (org-in-subtree-not-table-p)] ) diff --git a/lisp/progmodes/idlwave.el b/lisp/progmodes/idlwave.el index e66c9655..7502a49 100644 --- a/lisp/progmodes/idlwave.el +++ b/lisp/progmodes/idlwave.el @@ -3713,7 +3713,7 @@ expression to enter. The lines containing S1 and S2 are reindented using `indent-region' unless the optional second argument NOINDENT is non-nil." (if (derived-mode-p 'idlwave-shell-mode) - ;; This is a gross hack to avoit template abbrev expansion + ;; This is a gross hack to avoid template abbrev expansion ;; in the shell. FIXME: This is a dirty hack. (if (and (eq this-command 'self-insert-command) (equal last-abbrev-location (point))) diff --git a/src/regex.c b/src/regex.c index 766ad26..8526645 100644 --- a/src/regex.c +++ b/src/regex.c @@ -515,7 +515,7 @@ init_syntax_once (void) #define STREQ(s1, s2) ((strcmp (s1, s2) == 0)) -#ifndef emacs +#ifndef emacs # undef max # undef min # define max(a, b) ((a) > (b) ? (a) : (b)) @@ -1632,7 +1632,7 @@ static boolean at_begline_loc_p (re_char *pattern, re_char *p, static boolean at_endline_loc_p (re_char *p, re_char *pend, reg_syntax_t syntax); static re_char *skip_one_char (re_char *p); -static int analyse_first (re_char *p, re_char *pend, +static int analyze_first (re_char *p, re_char *pend, char *fastmap, const int multibyte); /* Fetch the next character in the uncompiled pattern, with no @@ -2688,7 +2688,7 @@ regex_compile (const_re_char *pattern, size_t size, reg_syntax_t syntax, size_t startoffset = 0; re_opcode_t ofj = /* Check if the loop can match the empty string. */ - (simple || !analyse_first (laststart, b, NULL, 0)) + (simple || !analyze_first (laststart, b, NULL, 0)) ? on_failure_jump : on_failure_jump_loop; assert (skip_one_char (laststart) <= b); @@ -2735,7 +2735,7 @@ regex_compile (const_re_char *pattern, size_t size, reg_syntax_t syntax, GET_BUFFER_SPACE (7); /* We might use less. */ if (many_times_ok) { - boolean emptyp = analyse_first (laststart, b, NULL, 0); + boolean emptyp = analyze_first (laststart, b, NULL, 0); /* The non-greedy multiple match looks like a repeat..until: we only need a conditional jump @@ -3836,7 +3836,7 @@ group_in_compile_stack (compile_stack_type compile_stack, regnum_t regnum) return false; } -/* analyse_first. +/* analyze_first. If fastmap is non-NULL, go through the pattern and fill fastmap with all the possible leading chars. If fastmap is NULL, don't bother filling it up (obviously) and only return whether the @@ -3847,7 +3847,7 @@ group_in_compile_stack (compile_stack_type compile_stack, regnum_t regnum) Return -1 if fastmap was not updated accurately. */ static int -analyse_first (const_re_char *p, const_re_char *pend, char *fastmap, +analyze_first (const_re_char *p, const_re_char *pend, char *fastmap, const int multibyte) { int j, k; @@ -4089,7 +4089,7 @@ analyse_first (const_re_char *p, const_re_char *pend, char *fastmap, { /* We have to look down both arms. We first go down the "straight" path so as to minimize stack usage when going through alternatives. */ - int r = analyse_first (p, pend, fastmap, multibyte); + int r = analyze_first (p, pend, fastmap, multibyte); if (r) return r; p += j; } @@ -4139,7 +4139,7 @@ analyse_first (const_re_char *p, const_re_char *pend, char *fastmap, /* We reached the end without matching anything. */ return 1; -} /* analyse_first */ +} /* analyze_first */ /* re_compile_fastmap computes a ``fastmap'' for the compiled pattern in BUFP. A fastmap records which of the (1 << BYTEWIDTH) possible @@ -4169,7 +4169,7 @@ re_compile_fastmap (struct re_pattern_buffer *bufp) memset (fastmap, 0, 1 << BYTEWIDTH); /* Assume nothing's valid. */ bufp->fastmap_accurate = 1; /* It will be when we're done. */ - analysis = analyse_first (bufp->buffer, bufp->buffer + bufp->used, + analysis = analyze_first (bufp->buffer, bufp->buffer + bufp->used, fastmap, RE_MULTIBYTE_P (bufp)); bufp->can_be_null = (analysis != 0); return 0; commit 2e7f6d53f3831bdf8c96a630abca2f926fc45aae Author: Paul Eggert Date: Sat Dec 13 22:41:02 2014 -0800 * notes/unicode: Track leim/quail file renames. diff --git a/admin/ChangeLog b/admin/ChangeLog index ed956f9..ae84460 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog @@ -1,3 +1,7 @@ +2014-12-14 Paul Eggert + + * notes/unicode: Track leim/quail file renames. + 2014-12-14 Glenn Morris * quick-install-emacs (PUBLIC_LIBSRC_SCRIPTS): Remove, and all uses. diff --git a/admin/notes/unicode b/admin/notes/unicode index d20aa4b..12454f8 100644 --- a/admin/notes/unicode +++ b/admin/notes/unicode @@ -214,11 +214,6 @@ nontrivial changes to the build process. operating in some other language environment. etc/tutorials/TUTORIAL.ja - leim/quail/cyril-jis.el - leim/quail/hanja-jis.el - leim/quail/japanese.el - leim/quail/py-punct.el - leim/quail/pypunct-b5.el lisp/international/ja-dic-cnv.el lisp/international/ja-dic-utl.el lisp/international/kinsoku.el @@ -226,18 +221,23 @@ nontrivial changes to the build process. lisp/international/titdic-cnv.el lisp/language/japan-util.el lisp/language/japanese.el + lisp/leim/quail/cyril-jis.el + lisp/leim/quail/hanja-jis.el + lisp/leim/quail/japanese.el + lisp/leim/quail/py-punct.el + lisp/leim/quail/pypunct-b5.el lisp/term/x-win.el * utf-8-emacs These files contain characters that cannot be encoded in UTF-8. - leim/quail/tibetan.el - leim/quail/ethiopic.el lisp/international/titdic-cnv.el lisp/language/tibetan.el lisp/language/tibet-util.el lisp/language/ind-util.el + lisp/leim/quail/ethiopic.el + lisp/leim/quail/tibetan.el This file is part of GNU Emacs. commit 49daed60510a073062b41fa39fd7c010cb0a315e Author: Glenn Morris Date: Sat Dec 13 18:38:21 2014 -0800 Remove lib-src/grep-changelog Ref: http://lists.gnu.org/archive/html/emacs-devel/2014-12/msg00145.html * lib-src/grep-changelog: Remove file. * lib-src/Makefile.in (INSTALLABLE_SCRIPTS): Remove. (all, install, uninstall): Remove INSTALLABLE_SCRIPTS. * doc/man/grep-changelog.1: Remove file. * make-dist: No more lib-src/grep-changelog. * INSTALL: No longer mention grep-changelog. * admin/quick-install-emacs (PUBLIC_LIBSRC_SCRIPTS): Remove, and all uses. * admin/authors.el (authors-valid-file-names): Add grep-changelog. * etc/NEWS: Mention this. diff --git a/ChangeLog b/ChangeLog index 15117e4..130e587 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2014-12-14 Glenn Morris + * make-dist: No more lib-src/grep-changelog. + * INSTALL.REPO: Revert 2014-12-06 change. 2014-12-13 Paul Eggert diff --git a/INSTALL b/INSTALL index 8ecee65..81140a2 100644 --- a/INSTALL +++ b/INSTALL @@ -464,8 +464,7 @@ installed locations, with `make install'. By default, Emacs's files are installed in the following directories: `/usr/local/bin' holds the executable programs users normally run - - `emacs', `etags', `ctags', `emacsclient', and - `grep-changelog'. + `emacs', `etags', `ctags', `emacsclient'. `/usr/local/share/emacs/VERSION/lisp' holds the Emacs Lisp library; `VERSION' stands for the number of the Emacs version diff --git a/admin/ChangeLog b/admin/ChangeLog index 2e02f04..ed956f9 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog @@ -1,3 +1,8 @@ +2014-12-14 Glenn Morris + + * quick-install-emacs (PUBLIC_LIBSRC_SCRIPTS): Remove, and all uses. + * authors.el (authors-valid-file-names): Add grep-changelog. + 2014-12-13 Paul Eggert * notes/unicode: Don't mention Czech and Slovakian refcards. diff --git a/admin/authors.el b/admin/authors.el index b05f37b..42f3bcd 100644 --- a/admin/authors.el +++ b/admin/authors.el @@ -691,7 +691,7 @@ Changes to files in this list are not listed.") "etags-vmslib.c" "fakemail.c" "getdate.c" "getopt.h" "getopt1.c" "getopt_.h" "getopt_int.h" "gettext.h" "leditcfns.c" "loadst.c" "make-path.c" "qsort.c" "sorted-doc.c" "tcp.c" "timer.c" "wakeup.c" - "yow.c" + "yow.c" "grep-changelog" ;; etc/ "emacsclient.c" "etags.c" "hexl.c" "make-docfile.c" "movemail.c" "test-distrib.c" "testfile" diff --git a/admin/quick-install-emacs b/admin/quick-install-emacs index 5edc8d4..58fc5f0 100755 --- a/admin/quick-install-emacs +++ b/admin/quick-install-emacs @@ -28,7 +28,6 @@ PUBLIC_LIBSRC_BINARIES='emacsclient etags ctags ebrowse' -PUBLIC_LIBSRC_SCRIPTS='grep-changelog' AVOID="CVS -DIC README COPYING ChangeLog ~ [.]orig$ [.]rej$ Makefile$ Makefile.in$ makefile$ makefile.w32-in$ stamp-subdir [.]cvsignore [.]arch-ids [{]arch[}] [.][cho]$ make-docfile" @@ -230,9 +229,6 @@ maybe_emit_copy $BUILD/src/emacs $DST_BIN/emacs-$VERSION for F in $PUBLIC_LIBSRC_BINARIES; do maybe_emit_copy $BUILD/lib-src/$F $DST_BIN/$F done -for F in $PUBLIC_LIBSRC_SCRIPTS; do - maybe_emit_copy $SRC/lib-src/$F $DST_BIN/$F -done if test x"$SRC" = x"$BUILD"; then PFXS="$BUILD" @@ -259,7 +255,7 @@ for SUBDIR in lisp leim etc lib-src info; do ;; lib-src) DST="$DST_LIBEXEC" - AVOID_PAT="`echo "($AVOID ($PUBLIC_LIBSRC_BINARIES $PUBLIC_LIBSRC_SCRIPTS)\$)" | tr ' ' '|'`" + AVOID_PAT="`echo "($AVOID ($PUBLIC_LIBSRC_BINARIES)\$)" | tr ' ' '|'`" ;; info) DST="$DST_INFO" diff --git a/doc/man/ChangeLog b/doc/man/ChangeLog index ad220a3..813a416 100644 --- a/doc/man/ChangeLog +++ b/doc/man/ChangeLog @@ -1,3 +1,7 @@ +2014-12-14 Glenn Morris + + * grep-changelog.1: Remove file. + 2014-11-10 Glenn Morris * emacs.1.in: Rename from emacs.1. diff --git a/doc/man/grep-changelog.1 b/doc/man/grep-changelog.1 deleted file mode 100644 index a3635a6..0000000 --- a/doc/man/grep-changelog.1 +++ /dev/null @@ -1,80 +0,0 @@ -.\" -*- nroff -*- -.\" See section COPYING for copyright and redistribution information. -.TH grep-changelog 1 -.SH NAME -grep-changelog \- print ChangeLog entries matching criteria -.SH SYNOPSIS -.B grep-changelog -.RI [ options ] -.RI [ CHANGELOG .\|.\|.] -.SH DESCRIPTION -.B grep-changelog -searches the named -.IR CHANGELOG s -(by default files matching the regular expressions -.B ChangeLog -and -.BR "ChangeLog\e.[0-9]+" ) -for entries matching the specified criteria. At least one option or -file must be specified. This program is distributed with -.BR "GNU Emacs" . -.PP -.SH OPTIONS -The program accepts unambiguous abbreviations for option names. -.TP -.B \-\-author=AUTHOR -Print entries whose author matches regular expression -.IR AUTHOR . -.TP -.B \-\-text=TEXT -Print entries whose text matches regular expression -.IR TEXT . -.TP -.B \-\-exclude=TEXT -Exclude entries matching regular expression -.IR TEXT . -.TP -.B \-\-from\-date=YYYY\-MM\-DD -Only consider entries made on or after the given date. -ChangeLog date entries not in the -\*(lqYYYY\-MM\-DD\*(rq format are never matched. -.TP -.B \-\-to\-date=YYYY\-MM\-DD -Only consider entries made on or before the given date. -.TP -.B \-\-rcs\-log -Print output in a format suitable for RCS log entries. -This format removes author lines, leading spaces, and file names. -.TP -.B \-\-with\-date -In RCS log format, print short dates. -.TP -.B \-\-reverse -Show matches in reverse order. -.TP -.B \-\-version -Display version information. -.TP -.B \-\-help -Display basic usage information. -. -.SH COPYING -Copyright -.if t \(co -.if n (C) -2008-2014 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 -preserved on all copies. -.PP -Permission is granted to copy and distribute modified versions of -this document under the conditions for verbatim copying, provided that -the entire resulting derived work is distributed under the terms of -a permission notice identical to this one. -.PP -Permission is granted to copy and distribute translations of this -document into another language, under the above conditions for -modified versions, except that this permission notice may be stated -in a translation approved by the Free Software Foundation. -. diff --git a/etc/NEWS b/etc/NEWS index 58e4b0e..01c8431 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -43,6 +43,11 @@ Use './configure PKG_CONFIG=/full/name/of/pkg-config' if you need to. ** The configure option '--enable-silent-rules' and the command 'make V=0' now do a better job of suppressing chatter. +--- +** The `grep-changelog' script (and its manual page) are no longer included. +It has no particular connection to Emacs and has not changed in years, +so if you want to use it, you can always take a copy from an older Emacs. + * Startup Changes in Emacs 25.1 diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index ab67538..9b6c0da 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,3 +1,9 @@ +2014-12-14 Glenn Morris + + * grep-changelog: Remove file. + * Makefile.in (INSTALLABLE_SCRIPTS): Remove. + (all, install, uninstall): Remove INSTALLABLE_SCRIPTS. + 2014-11-23 Glenn Morris * Makefile.in (emacsclient.res): Fix yesterday's thinko. diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in index 77d3b78..cae0898 100644 --- a/lib-src/Makefile.in +++ b/lib-src/Makefile.in @@ -137,8 +137,6 @@ CLIENTW = @CLIENTW@ INSTALLABLES = etags${EXEEXT} ctags${EXEEXT} emacsclient${EXEEXT} $(CLIENTW) \ ebrowse${EXEEXT} -INSTALLABLE_SCRIPTS = grep-changelog - # Things that Emacs runs internally, or during the build process, # which should not be installed in bindir. UTILITIES = profile${EXEEXT} movemail${EXEEXT} hexl${EXEEXT} \ @@ -215,7 +213,7 @@ CPP_CFLAGS = ${BASE_CFLAGS} ${PROFILING_CFLAGS} ${CPPFLAGS} ${CFLAGS} # Configuration files for .o files to depend on. config_h = ../src/config.h $(srcdir)/../src/conf_post.h -all: ${EXE_FILES} ${SCRIPTS} ${INSTALLABLE_SCRIPTS} +all: ${EXE_FILES} ${SCRIPTS} .PHONY: all need-blessmail maybe-blessmail @@ -281,17 +279,11 @@ install: $(DESTDIR)${archlibdir} for file in ${INSTALLABLES} ; do \ $(INSTALL_PROGRAM) $(INSTALL_STRIP) $${file} "$(DESTDIR)${bindir}"/`echo $${file} | sed -e 's/${EXEEXT}$$//' -e '$(TRANSFORM)'`${EXEEXT} ; \ done - for file in ${INSTALLABLE_SCRIPTS} ; do \ - $(INSTALL_SCRIPT) ${srcdir}/$${file} "$(DESTDIR)${bindir}"/`echo $${file} | sed '$(TRANSFORM)'` ; \ - done uninstall: for file in ${INSTALLABLES}; do \ rm -f "$(DESTDIR)${bindir}"/`echo $${file} | sed -e 's/${EXEEXT}$$//' -e '$(TRANSFORM)'`${EXEEXT} ; \ done - for file in ${INSTALLABLE_SCRIPTS}; do \ - rm -f "$(DESTDIR)${bindir}"/`echo $${file} | sed '$(TRANSFORM)'` ; \ - done if [ -d "$(DESTDIR)${archlibdir}" ]; then \ (cd "$(DESTDIR)${archlibdir}" && rm -f ${UTILITIES} ${SCRIPTS}) \ fi diff --git a/lib-src/grep-changelog b/lib-src/grep-changelog deleted file mode 100755 index ab8c5e3..0000000 --- a/lib-src/grep-changelog +++ /dev/null @@ -1,265 +0,0 @@ -#! /usr/bin/perl - -# Copyright (C) 1999-2014 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. - -# 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. - -# You should have received a copy of the GNU General Public License -# along with GNU Emacs. If not, see . - - -# Extract entries from ChangeLogs matching specified criteria. -# Optionally format the resulting output to a form suitable for RCS -# logs, like they are used in Emacs, for example. In this format, -# author lines, leading spaces, and file names are removed. - -require 5; -use strict; - -# Parse command line options. - -use vars qw($author $regexp $exclude $from_date $to_date - $rcs_log $with_date $version $help $reverse - @entries); - -use Getopt::Long; - -my $result; - -if (@ARGV == 0) { - - # No arguments cannot possibly mean "show everything"!! - $result = 0; - -} else { - - $result = GetOptions ("author=s" => \$author, - "text=s" => \$regexp, - "exclude=s" => \$exclude, - "from-date=s" => \$from_date, - "to-date=s" => \$to_date, - "rcs-log" => \$rcs_log, - "with-date" => \$with_date, - "reverse!" => \$reverse, - "version" => \$version, - "help" => \$help); - - # If date options are specified, check that they have the format - # YYYY-MM-DD. - - $result = 0 if $from_date && $from_date !~ /^\d\d\d\d-\d\d-\d\d$/; - $result = 0 if $to_date && $to_date !~ /^\d\d\d\d-\d\d-\d\d$/; -} - -# Print usage information and exit when necessary. - -if ($result == 0 || $help) { - print <)) { - if ($line =~ /^\S/) { - # Line is an author-line. Print previous entry if - # it matches. - print_log ($header, $entry) - if header_match_p ($header) && entry_match_p ($entry); - - $entry = ""; - $header = $line; - - # Add empty lines below the header. - while (defined($line = ) && $line =~ /^\s*$/) { - $header = "$header$line"; - } - } - - last unless defined $line; - - if ($line =~ /^\s*\*/) { - # LINE is the first line of a ChangeLog entry. Print - # previous entry if it matches. - print_log ($header, $entry) - if header_match_p ($header) && entry_match_p ($entry); - $entry = $line; - } else { - # Add LINE to the current entry. - $entry = "$entry$line"; - } - } - - # Print last entry if it matches. - print_log ($header, $entry) - if header_match_p ($header) && entry_match_p ($entry); - - close IN; - - if ($reverse) { - for (my $entry = @entries; $entry; $entry--) { - print $entries[$entry-1]; - } - } -} - - -# Main program. Process ChangeLogs. - -# If files were specified on the command line, parse those files in the -# order supplied by the user; otherwise parse default files ChangeLog and -# ChangeLog.NNN according to $reverse. -unless (@ARGV > 0) { - @ARGV = ("ChangeLog"); - - push @ARGV, - map {"ChangeLog.$_"} - sort {$b <=> $a} - map {/\.(\d+)$/; $1} - do { - opendir D, '.'; - grep /^ChangeLog\.\d+$/, readdir D; - }; - - @ARGV = reverse @ARGV if $reverse; -} - -while (defined (my $log = shift @ARGV)) { - parse_changelog ($log) if -f $log; -} - - -# grep-changelog ends here. diff --git a/make-dist b/make-dist index 6e85f1d..f287606 100755 --- a/make-dist +++ b/make-dist @@ -382,7 +382,7 @@ echo "Making links to \`lib-src'" (cd lib-src ln [a-zA-Z]*.[ch] ../${tempdir}/lib-src ln ChangeLog Makefile.in README ../${tempdir}/lib-src - ln grep-changelog rcs2log ../${tempdir}/lib-src + ln rcs2log ../${tempdir}/lib-src ln makefile.w32-in ../${tempdir}/lib-src ln update-game-score.exe.manifest ../${tempdir}/lib-src) commit 4d806dc01d4ffdecadfe75e92f4f190952f5447c Author: Glenn Morris Date: Sat Dec 13 17:57:46 2014 -0800 * INSTALL.REPO: Revert 2014-12-06 change. You _can_ just run make after a clean checkout, thanks to the GNUmakefile. diff --git a/ChangeLog b/ChangeLog index 041b296..15117e4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2014-12-14 Glenn Morris + + * INSTALL.REPO: Revert 2014-12-06 change. + 2014-12-13 Paul Eggert * lib/gnulib.mk: Regenerate. diff --git a/INSTALL.REPO b/INSTALL.REPO index 67dceb8..83b6f2f 100644 --- a/INSTALL.REPO +++ b/INSTALL.REPO @@ -1,5 +1,10 @@ Building and Installing Emacs from the Repository +Simply run 'make'. This should work if your files are freshly checked +out from the repository, and if you have the proper tools installed. +If it doesn't work, or if you have special build requirements, the +following information may be helpful. + Building Emacs from the source-code repository requires some tools that are not needed when building from a release. You will need: @@ -29,12 +34,6 @@ can invoke './configure -C'. After configuring, build Emacs as follows: If you want to install Emacs, type 'make install' instead of 'make' in the last command. -After your first build, you can usually just run 'make' after any -updates from the Savannah repository or local edits; the makefile -contains logic to re-run configure as needed. However, if the autoconf -input files have changed, or in some other situations, you will need -to run 'make bootstrap' (more below). - Occasionally the file 'lisp/loaddefs.el' (and similar automatically generated files, such as 'esh-groups.el', and '*-loaddefs.el' in some subdirectories of 'lisp/', e.g., 'mh-e/' and 'calendar/') will need to be commit a8af924ba902d93d37fe6f519508ec1104246351 Author: Glenn Morris Date: Sat Dec 13 17:50:06 2014 -0800 Place ChangeLog entries in the correct files diff --git a/ChangeLog b/ChangeLog index df425a1..041b296 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,20 +1,6 @@ 2014-12-13 Paul Eggert - Convert Czech and Slovakian refcards to UTF-8 - * admin/notes/unicode: Don't mention Czech and Slovakian refcards. - * etc/refcards/cs-dired-ref.tex, etc/refcards/cs-refcard.tex: - * etc/refcards/cs-survival.tex, etc/refcards/sk-dired-ref.tex: - * etc/refcards/sk-refcard.tex, etc/refcards/sk-survival.tex: - Convert from iso-latin-2 to utf-8. Remove no-longer-necessary - coding comments and "\input utf8off" directives. - -2014-12-13 Paul Eggert - - Replace union hack with C11-style max_align_t - * admin/merge-gnulib (GNULIB_MODULES): Add stddef, for max_align_t. * lib/gnulib.mk: Regenerate. - * src/alloc.c (XMALLOC_BASE_ALIGNMENT): Use max_align_t instead of - a hack involving a union. 2014-12-13 Paul Eggert @@ -62,9 +48,8 @@ 2014-12-11 unistd: fix iOS check conditional 2014-12-08 apply _GL_ATTRIBUTE_PURE to some inline functions 2014-12-02 support GNU format printf and scanf on mingw - * doc/misc/texinfo.tex, lib/stat-time.h, lib/stddef.in.h: - * lib/timespec.h, m4/extensions.m4, m4/stddef_h.m4, m4/stdio_h.m4: - Update from gnulib. + * lib/stat-time.h, lib/stddef.in.h, lib/timespec.h: + * m4/extensions.m4, m4/stddef_h.m4, m4/stdio_h.m4: Update from gnulib. * lib/gnulib.mk: Regenerate. 2014-12-06 Stephen Leake diff --git a/admin/ChangeLog b/admin/ChangeLog index 360e2f1..2e02f04 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog @@ -1,3 +1,9 @@ +2014-12-13 Paul Eggert + + * notes/unicode: Don't mention Czech and Slovakian refcards. + + * merge-gnulib (GNULIB_MODULES): Add stddef, for max_align_t. + 2014-12-06 Stephen Leake * notes/commits: Delete; merge into ./CONTRIBUTE. diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index 45ab792..83cdbc6 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -1,3 +1,7 @@ +2014-12-12 Paul Eggert + + * texinfo.tex: Update from gnulib. + 2014-12-08 Andrey Kotlarski * eww.texi (Basics): Document managing multiple eww buffers. diff --git a/etc/ChangeLog b/etc/ChangeLog index 5e02fce..0a22f9f 100644 --- a/etc/ChangeLog +++ b/etc/ChangeLog @@ -1,3 +1,12 @@ +2014-12-13 Paul Eggert + + Convert Czech and Slovakian refcards to UTF-8 + * refcards/cs-dired-ref.tex, refcards/cs-refcard.tex: + * refcards/cs-survival.tex, refcards/sk-dired-ref.tex: + * refcards/sk-refcard.tex, refcards/sk-survival.tex: + Convert from iso-latin-2 to utf-8. Remove no-longer-necessary + coding comments and "\input utf8off" directives. + 2014-12-13 Lars Magne Ingebrigtsen * NEWS: Mention directory-name-p. diff --git a/src/ChangeLog b/src/ChangeLog index f4bcc8a..12fe16d 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2014-12-13 Paul Eggert + + * alloc.c (XMALLOC_BASE_ALIGNMENT): Use max_align_t instead of + a hack involving a union. + 2014-12-13 Eli Zaretskii * gnutls.c (Fgnutls_available_p, syms_of_gnutls): Move commit 1c11620f717a8fd21dba01eacf1286301a0b8fc0 Author: Paul Eggert Date: Sat Dec 13 15:56:10 2014 -0800 Convert Czech and Slovakian refcards to UTF-8 * admin/notes/unicode: Don't mention Czech and Slovakian refcards. * etc/refcards/cs-dired-ref.tex, etc/refcards/cs-refcard.tex: * etc/refcards/cs-survival.tex, etc/refcards/sk-dired-ref.tex: * etc/refcards/sk-refcard.tex, etc/refcards/sk-survival.tex: Convert from iso-latin-2 to utf-8. Remove no-longer-necessary coding comments and "\input utf8off" directives. diff --git a/ChangeLog b/ChangeLog index 7cf6d54..df425a1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,15 @@ 2014-12-13 Paul Eggert + Convert Czech and Slovakian refcards to UTF-8 + * admin/notes/unicode: Don't mention Czech and Slovakian refcards. + * etc/refcards/cs-dired-ref.tex, etc/refcards/cs-refcard.tex: + * etc/refcards/cs-survival.tex, etc/refcards/sk-dired-ref.tex: + * etc/refcards/sk-refcard.tex, etc/refcards/sk-survival.tex: + Convert from iso-latin-2 to utf-8. Remove no-longer-necessary + coding comments and "\input utf8off" directives. + +2014-12-13 Paul Eggert + Replace union hack with C11-style max_align_t * admin/merge-gnulib (GNULIB_MODULES): Add stddef, for max_align_t. * lib/gnulib.mk: Regenerate. diff --git a/admin/notes/unicode b/admin/notes/unicode index 79e0e1d..d20aa4b 100644 --- a/admin/notes/unicode +++ b/admin/notes/unicode @@ -187,19 +187,6 @@ nontrivial changes to the build process. leim/MISC-DIC/cangjie-table.cns - * iso-latin-2 - - These files are processed by csplain, a program that requires - Latin-2 input. In 2012 the csplain maintainers started - recommending UTF-8, but these files haven't been converted yet. - - etc/refcards/cs-dired-ref.tex - etc/refcards/cs-refcard.tex - etc/refcards/cs-survival.tex - etc/refcards/sk-dired-ref.tex - etc/refcards/sk-refcard.tex - etc/refcards/sk-survival.tex - * japanese-iso-8bit SKK-JISYO.L is a verbatim copy of a file taken from an external source. diff --git a/etc/refcards/cs-dired-ref.tex b/etc/refcards/cs-dired-ref.tex index 0663bf2..bd4aca2 100644 --- a/etc/refcards/cs-dired-ref.tex +++ b/etc/refcards/cs-dired-ref.tex @@ -1,9 +1,9 @@ -% Reference Card for Dired -*- coding: iso-latin-2 -*- +% Reference Card for Dired % Copyright (C) 2000-2014 Free Software Foundation, Inc. % Author: Evgeny Roubinchtein -% Czech translation: Pavel Jank , March 2001 +% Czech translation: Pavel Jan鱈k , March 2001 % This file is part of GNU Emacs. @@ -31,11 +31,6 @@ % Czech hyphenation rules applied \chyph -% Without this, pdfTeX 3.1415926-2.5-1.40.14 (TeX Live 2013/Debian) -% aborts with: "! UTF-8 INPUT IS CORRUPTED ! -% May be you are using another input encoding" -\input utf8off - % This file can be printed with 1, 2, or 3 columns per page. % Specify how many you want here. \newcount\columnsperpage @@ -60,7 +55,7 @@ \centerline{For GNU Emacs version \versionemacs} \centerline{Originally written May 2000 by Evgeny Roubinchtein,} \centerline{using refcard layout designed by Stephen Gildea.} -\centerline{Translated by Pavel Jank.} +\centerline{Translated by Pavel Jan鱈k.} Permission is granted to make and distribute copies of this card provided the copyright notice and this permission notice @@ -252,10 +247,10 @@ For copies of the GNU Emacs manual, see: %**end of header -\title{Referenn karta pro Dired} +\title{Referenn鱈 karta pro Dired} -\centerline{(ureno pro Dired v GNU Emacsu \versionemacs)} -\centerline{Pkazy oznaen \dx{} vyaduj dired-x} +\centerline{(ureno pro Dired v GNU Emacsu \versionemacs)} +\centerline{P鱈kazy oznaen辿 \dx{} vy転aduj鱈 dired-x} % trim this down to fit everything on one page % \section{General} @@ -284,119 +279,119 @@ For copies of the GNU Emacs manual, see: % When editing several directories in one buffer, each directory acts as a % page, so C-x [ and C-x ] can be used to move between directories. -\section{Sputn a ukonen Dired} +\section{Spu邸tn鱈 a ukonen鱈 Dired} -\key{sputn dired}{C-x d} -\key{sputn dired v adres癢i s aktulnm souborem}{C-x C-j \dx} -\key{ukonen dired}{q} +\key{spu邸tn鱈 dired}{C-x d} +\key{spu邸tn鱈 dired v adres叩i s aktu叩ln鱈m souborem}{C-x C-j \dx} +\key{ukonen鱈 dired}{q} -\section{Pkazy pro pesuny} +\section{P鱈kazy pro pesuny} -\key{zpt na pedchoz dku}{p} -\key{vped na nsledujc dku}{n} -\key{nahoru na pedchoz adres癢}{<} -\key{dol na nsledujc adres癢}{>} -\key{na dal麹 oznaen soubor}{M-\}} -\key{na pedchoz oznaen soubor}{M-\{} -\key{zpt na pedchoz podadres癢}{M-C-p} -\key{vped na dal麹 podadres癢}{M-C-n} -\key{na nadazen adres癢}{^} -\key{jdi na prvn podadres癢}{M-C-d} +\key{zpt na pedchoz鱈 叩dku}{p} +\key{vped na n叩sleduj鱈c鱈 叩dku}{n} +\key{nahoru na pedchoz鱈 adres叩}{<} +\key{dol哲 na n叩sleduj鱈c鱈 adres叩}{>} +\key{na dal邸鱈 oznaen箪 soubor}{M-\}} +\key{na pedchoz鱈 oznaen箪 soubor}{M-\{} +\key{zpt na pedchoz鱈 podadres叩}{M-C-p} +\key{vped na dal邸鱈 podadres叩}{M-C-n} +\key{na nadazen箪 adres叩}{^} +\key{jdi na prvn鱈 podadres叩}{M-C-d} -\section{Pkazy pomoc myi} -\metax{otevi soubor}{Mouse_Button_2} +\section{P鱈kazy pomoc鱈 my邸i} +\metax{otevi soubor}{Mouse_Button_2} \metax{zobraz menu}{Control-Mouse_Button_3} -\section{Okamit akce nad soubory} - -\key{otevi aktuln soubor}{f} -\key{otevi aktuln soubor pouze pro ten}{v} -\key{otevi aktuln soubor v jinm okn}{o} -%%\key{otevi aktuln soubor v jinm rmci}{w} -%%\key{zobraz aktuln soubor}{C-u o} -\key{vytvo nov podadres癢}{+} -\key{porovnej soubor pod kurzorem s oznaenm}{=} - -\section{Znaen a odznaen soubor} - -\key{ozna soubor nebo podadres癢 pro dal麹 pkazy}{m} -\key{odzna soubor nebo soubory podadres癢e}{u} -\key{zru oznaen vech soubor v bufferu}{M-delete} -\key{ozna soubory se zadanou pponou}{* .} -\key{ozna vechny adres癢e}{* /} -\key{ozna vechny symbolick odkazy}{* @} -\key{ozna vechny spustiteln soubory}{* *} -\key{invertuj oznaen}{* t} -\key{ozna vechny soubory v aktulnm podadres癢i}{* s} -\key{ozna soubory vyhovujc regulrnmu vrazu}{* \%} -\key{zm跼 znaku na jin psmeno}{* c} -\key{ozna soubory, pro kter elispov vraz vrac t}{* ( \dx} +\section{Okam転it辿 akce nad soubory} + +\key{otevi aktu叩ln鱈 soubor}{f} +\key{otevi aktu叩ln鱈 soubor pouze pro ten鱈}{v} +\key{otevi aktu叩ln鱈 soubor v jin辿m okn}{o} +%%\key{otevi aktu叩ln鱈 soubor v jin辿m r叩mci}{w} +%%\key{zobraz aktu叩ln鱈 soubor}{C-u o} +\key{vytvo nov箪 podadres叩}{+} +\key{porovnej soubor pod kurzorem s oznaen箪m}{=} + +\section{Znaen鱈 a odznaen鱈 soubor哲} + +\key{ozna soubor nebo podadres叩 pro dal邸鱈 p鱈kazy}{m} +\key{odzna soubor nebo soubory podadres叩e}{u} +\key{zru邸 oznaen鱈 v邸ech soubor哲 v bufferu}{M-delete} +\key{ozna soubory se zadanou p鱈ponou}{* .} +\key{ozna v邸echny adres叩e}{* /} +\key{ozna v邸echny symbolick辿 odkazy}{* @} +\key{ozna v邸echny spustiteln辿 soubory}{* *} +\key{invertuj oznaen鱈}{* t} +\key{ozna v邸echny soubory v aktu叩ln鱈m podadres叩i}{* s} +\key{ozna soubory vyhovuj鱈c鱈 regul叩rn鱈mu v箪razu}{* \%} +\key{zm znaku na jin辿 p鱈smeno}{* c} +\key{ozna soubory, pro kter辿 elispov箪 v箪raz vrac鱈 t}{* ( \dx} \section{Modifikace Dired bufferu} -\key{vlo do tohoto bufferu podadres癢}{i} -\key{odstra oznaen soubory z bufferu}{k} -\key{odstra z bufferu vpis podadres癢e}{C-u k} -\key{znovu nati adres癢e (znaky se zachovaj)}{g} -\key{pepni tdn adres癢e podle jmna/data}{s} -\key{uprav volby pkazu ls}{C-u s} -\key{obnov znaky, skryt dky apod.}{C-_} -\key{skryj vechny podadres癢e}{M-\$} -\key{skryj nebo odkryj vechny podadres癢e}{\$} - -\section{Pkazy nad oznaenmi soubory} - -\key{kopruj soubor(y)}{C} -\key{pejmenuj soubor nebo pesu soubory}{R} -\key{zm跼 vlastnka souboru()}{O} -\key{zm跼 skupinu souboru()}{G} -\key{zm跼 pstupov prva souboru()}{M} +\key{vlo転 do tohoto bufferu podadres叩}{i} +\key{odstra oznaen辿 soubory z bufferu}{k} +\key{odstra z bufferu v箪pis podadres叩e}{C-u k} +\key{znovu nati adres叩e (znaky se zachovaj鱈)}{g} +\key{pepni t鱈dn鱈 adres叩e podle jm辿na/data}{s} +\key{uprav volby p鱈kazu ls}{C-u s} +\key{obnov znaky, skryt辿 叩dky apod.}{C-_} +\key{skryj v邸echny podadres叩e}{M-\$} +\key{skryj nebo odkryj v邸echny podadres叩e}{\$} + +\section{P鱈kazy nad oznaen箪mi soubory} + +\key{kop鱈ruj soubor(y)}{C} +\key{pejmenuj soubor nebo pesu soubory}{R} +\key{zm vlastn鱈ka souboru(哲)}{O} +\key{zm skupinu souboru(哲)}{G} +\key{zm p鱈stupov叩 pr叩va souboru(哲)}{M} \key{vytiskni soubor(y)}{P} -\key{zm跼 nzev souboru() na mal psmena}{\% l} -\key{zm跼 nzev souboru() na velk psmena}{\% u} -\key{sma oznaen soubory}{D} -%%\key{prove uuencode nebo uudecode souboru()}{U} +\key{zm n叩zev souboru(哲) na mal叩 p鱈smena}{\% l} +\key{zm n叩zev souboru(哲) na velk叩 p鱈smena}{\% u} +\key{sma転 oznaen辿 soubory}{D} +%%\key{prove uuencode nebo uudecode souboru(哲)}{U} \key{zkomprimuj nebo dekomprimuj soubor(y)}{Z} -\key{spus info na soubor}{I \dx} -\key{vytvo symbolick() odkaz(y)}{S} -\key{vytvo relativn symbolick odkazy}{Y} -\key{vytvo pevn odkaz}{H} -\key{prohledej soubory na regulrn vraz}{A} -\key{nahra regulrn vrazy}{Q} -\key{pelo soubory (byte-compile)}{B} -\key{nati soubory (load-file)}{L} -\key{spus pkaz na soubor(y)}{!} - -\section{Oznaen soubor pro smazn} -\leftline{\bf Odznaujc pkazy maou znaku pro smazn} -\key{ozna soubor pro smazn}{d} -%%\key{odstra znaku pro smazn}{delete} -\key{ozna vechny zlohy (soubory kon蓁c na \~{})}{\~{}} -\key{ozna vechny zlohy (auto-save)}{\#} -\key{ozna rzn doasn soubory}{\% \&} -\key{ozna 蓁slovan zlohy (kon蓁c na .\~{}1\~{} apod.)}{.} -\key{prove vmaz soubor oznaench ke smazn}{x} -\key{ozna soubory vyhovujc regulrnmu vrazu}{\% d} - -\section{Pkazy s regulrnmi vrazy} - -\key{ozna soubory vyhovujc regulrnmu vrazu}{\% m} -\key{kopruj oznaen soubory obsahujc regexp}{\% C} -\key{pejmenuj oznaen soubory vyhovujc regexp}{\% R} -\key{pevn odkaz}{\% H} -\key{symbolick odkaz}{\% S} -\key{symbolick odkaz s relativn cestou}{\% Y} -\key{ozna pro smazn}{\% d} +\key{spus泥 info na soubor}{I \dx} +\key{vytvo symbolick箪(辿) odkaz(y)}{S} +\key{vytvo relativn鱈 symbolick辿 odkazy}{Y} +\key{vytvo pevn箪 odkaz}{H} +\key{prohledej soubory na regul叩rn鱈 v箪raz}{A} +\key{nahra regul叩rn鱈 v箪razy}{Q} +\key{pelo転 soubory (byte-compile)}{B} +\key{nati soubory (load-file)}{L} +\key{spus泥 p鱈kaz na soubor(y)}{!} + +\section{Oznaen鱈 soubor哲 pro smaz叩n鱈} +\leftline{\bf Odznauj鱈c鱈 p鱈kazy ma転ou znaku pro smaz叩n鱈} +\key{ozna soubor pro smaz叩n鱈}{d} +%%\key{odstra znaku pro smaz叩n鱈}{delete} +\key{ozna v邸echny z叩lohy (soubory kon鱈c鱈 na \~{})}{\~{}} +\key{ozna v邸echny z叩lohy (auto-save)}{\#} +\key{ozna r哲zn辿 doasn辿 soubory}{\% \&} +\key{ozna 鱈slovan辿 z叩lohy (kon鱈c鱈 na .\~{}1\~{} apod.)}{.} +\key{prove v箪maz soubor哲 oznaen箪ch ke smaz叩n鱈}{x} +\key{ozna soubory vyhovuj鱈c鱈 regul叩rn鱈mu v箪razu}{\% d} + +\section{P鱈kazy s regul叩rn鱈mi v箪razy} + +\key{ozna soubory vyhovuj鱈c鱈 regul叩rn鱈mu v箪razu}{\% m} +\key{kop鱈ruj oznaen辿 soubory obsahuj鱈c鱈 regexp}{\% C} +\key{pejmenuj oznaen辿 soubory vyhovuj鱈c鱈 regexp}{\% R} +\key{pevn箪 odkaz}{\% H} +\key{symbolick箪 odkaz}{\% S} +\key{symbolick箪 odkaz s relativn鱈 cestou}{\% Y} +\key{ozna pro smaz叩n鱈}{\% d} \section{Dired a Find} -\metax{otevi v dired soubory vyhovujc vzorku}{M-x find-name-dired} -\metax{otevi v dired soubory obsahujc vzorek}{M-x find-grep-dired} -\metax{otevi v dired soubory podle vstupu \kbd{find}}{M-x find-dired} +\metax{otevi v dired soubory vyhovuj鱈c鱈 vzorku}{M-x find-name-dired} +\metax{otevi v dired soubory obsahuj鱈c鱈 vzorek}{M-x find-grep-dired} +\metax{otevi v dired soubory podle v箪stupu \kbd{find}}{M-x find-dired} -\section{Npovda} +\section{N叩povda} -\key{zobraz npovdu}{h} -\key{pehled pkaz dired}{?} +\key{zobraz n叩povdu}{h} +\key{pehled p鱈kaz哲 dired}{?} \copyrightnotice diff --git a/etc/refcards/cs-refcard.tex b/etc/refcards/cs-refcard.tex index 1da9b25..b64d21a 100644 --- a/etc/refcards/cs-refcard.tex +++ b/etc/refcards/cs-refcard.tex @@ -6,7 +6,7 @@ % Author: Stephen Gildea % Czech translation: Jan Buchal , January 1999 % Milan Zamazal , August 1999 -% Pavel Jank , November 2000 (Emacs 21) +% Pavel Jan鱈k , November 2000 (Emacs 21) % This file is part of GNU Emacs. @@ -49,11 +49,6 @@ % Czech hyphenation rules applied \chyph -% Without this, pdfTeX 3.1415926-2.5-1.40.14 (TeX Live 2013/Debian) -% aborts with: "! UTF-8 INPUT IS CORRUPTED ! -% May be you are using another input encoding" -\input utf8off - % This file can be printed with 1, 2, or 3 columns per page. % Specify how many you want here. \newcount\columnsperpage @@ -77,7 +72,7 @@ \centerline{Copyright \copyright\ \year\ Free Software Foundation, Inc.} \centerline{For GNU Emacs version \versionemacs} \centerline{Designed by Stephen Gildea} -\centerline{Translated by Jan Buchal, Milan Zamazal, Pavel Jank} +\centerline{Translated by Jan Buchal, Milan Zamazal, Pavel Jan鱈k} Permission is granted to make and distribute copies of this card provided the copyright notice and this permission notice @@ -264,68 +259,68 @@ For copies of the GNU Emacs manual, see: %**end of header -\title{GNU Emacs -- Referenn karta} +\title{GNU Emacs -- Referenn鱈 karta} \centerline{(pro verzi \versionemacs)} -\section{Sputn Emacsu} +\section{Spu邸tn鱈 Emacsu} -Pro vstup do GNU~Emacsu~\versionemacs{} napite jeho jmno: \kbd{emacs} +Pro vstup do GNU~Emacsu~\versionemacs{} napi邸te jeho jm辿no: \kbd{emacs} -Jak na蓁tat a editovat soubory se dozvte n躱e v~oddle Soubory. +Jak na鱈tat a editovat soubory se dozv鱈te n鱈転e v~odd鱈le Soubory. -\section{Oputn Emacsu} +\section{Opu邸tn鱈 Emacsu} -\key{pozastaven Emacsu (ikonizace v~X11)}{C-z} -\key{definitivn odchod z~Emacsu}{C-x C-c} +\key{pozastaven鱈 Emacsu (ikonizace v~X11)}{C-z} +\key{definitivn鱈 odchod z~Emacsu}{C-x C-c} \section{Soubory} -\key{{\bf na蓁st} souboru do Emacsu}{C-x C-f} -\key{{\bf uloit} soubor zpt na disk}{C-x C-s} -\key{uloit {\bf vechny} soubory}{C-x s} -\key{{\bf vloit} obsahu jinho souboru do bufferu}{C-x i} -\key{zamnit tento soubor jinm souborem}{C-x C-v} -\key{zapsat buffer do zadanho souboru}{C-x C-w} -\key{vloit do systmu sprvy verz}{C-x C-q} +\key{{\bf na鱈st} souboru do Emacsu}{C-x C-f} +\key{{\bf ulo転it} soubor zpt na disk}{C-x C-s} +\key{ulo転it {\bf v邸echny} soubory}{C-x s} +\key{{\bf vlo転it} obsahu jin辿ho souboru do bufferu}{C-x i} +\key{zamnit tento soubor jin箪m souborem}{C-x C-v} +\key{zapsat buffer do zadan辿ho souboru}{C-x C-w} +\key{vlo転it do syst辿mu spr叩vy verz鱈}{C-x C-q} -\section{Pou壌vn npovdy} +\section{Pou転鱈v叩n鱈 n叩povdy} -Systm npovdy je snadn. Stisknte \kbd{C-h} (nebo \kbd{F1}) a sledujte -instrukce. vodn {\bf tutoril} lze spustit pomoc \kbd{C-h t}. +Syst辿m n叩povdy je snadn箪. Stisknte \kbd{C-h} (nebo \kbd{F1}) a sledujte +instrukce. vodn鱈 {\bf tutori叩l} lze spustit pomoc鱈 \kbd{C-h t}. -\key{odstranit okno s~npovdou}{C-x 1} -\key{rolovat okno s~npovdou}{C-M-v} +\key{odstranit okno s~n叩povdou}{C-x 1} +\key{rolovat okno s~n叩povdou}{C-M-v} -\key{apropos: pkazy odpovdajc etzci}{C-h a} -\key{zobrazit funkci dan klvesy}{C-h c} +\key{apropos: p鱈kazy odpov鱈daj鱈c鱈 etzci}{C-h a} +\key{zobrazit funkci dan辿 kl叩vesy}{C-h c} \key{zobrazit popis funkce}{C-h f} -\key{zobrazit informace o~aktulnch mdech}{C-h m} +\key{zobrazit informace o~aktu叩ln鱈ch m坦dech}{C-h m} \section{Opravy chyb} -\key{{\bf peruit} zadvan nebo vykonvan pkaz}{C-g} -\metax{{\bf obnovit} soubor ztracen pdem systmu}{M-x recover-file} -\key{{\bf zruit} nechtnou zmnu}{C-x u {\it n.} C-_} -\metax{vrtit pvodn obsah bufferu}{M-x revert-buffer} -\key{pekreslit \uv{rozpadlou} obrazovku}{C-l} +\key{{\bf peru邸it} zad叩van箪 nebo vykon叩van箪 p鱈kaz}{C-g} +\metax{{\bf obnovit} soubor ztracen箪 p叩dem syst辿mu}{M-x recover-file} +\key{{\bf zru邸it} nechtnou zmnu}{C-x u {\it n.} C-_} +\metax{vr叩tit p哲vodn鱈 obsah bufferu}{M-x revert-buffer} +\key{pekreslit \uv{rozpadlou} obrazovku}{C-l} -\section{Prstkov vyhledvn} +\section{P鱈r哲stkov辿 vyhled叩v叩n鱈} -\key{vyhledat dopedu}{C-s} +\key{vyhledat dopedu}{C-s} \key{vyhledat dozadu}{C-r} -\key{vyhledat regulrn vraz}{C-M-s} -\key{vyhledat regulrn vraz dozadu}{C-M-r} +\key{vyhledat regul叩rn鱈 v箪raz}{C-M-s} +\key{vyhledat regul叩rn鱈 v箪raz dozadu}{C-M-r} -\key{pedchoz vyhledvan etzec}{M-p} -\key{nsledujc novj麹 vyhledvan etzec}{M-n} -\key{ukonit inkrementln vyhledvn}{RET} -\key{zruit efekt poslednho zadanho znaku}{DEL} -\key{peruit probhajc vyhledvn}{C-g} +\key{pedchoz鱈 vyhled叩van箪 etzec}{M-p} +\key{n叩sleduj鱈c鱈 novj邸鱈 vyhled叩van箪 etzec}{M-n} +\key{ukonit inkrement叩ln鱈 vyhled叩v叩n鱈}{RET} +\key{zru邸it efekt posledn鱈ho zadan辿ho znaku}{DEL} +\key{peru邸it prob鱈haj鱈c鱈 vyhled叩v叩n鱈}{C-g} -Dal麹 \kbd{C-s} nebo \kbd{C-r} zopakuje vyhledn v~danm smru. Pokud -Emacs vyhledv, \kbd{C-g} zru麹 pouze nenalezenou 葹st etzce. +Dal邸鱈 \kbd{C-s} nebo \kbd{C-r} zopakuje vyhled叩n鱈 v~dan辿m smru. Pokud +Emacs vyhled叩v叩, \kbd{C-g} zru邸鱈 pouze nenalezenou 叩st etzce. \shortcopyrightnotice @@ -333,311 +328,311 @@ Emacs vyhled \section{Pohyb} \paralign to \hsize{#\tabskip=10pt plus 1 fil&#\tabskip=0pt&#\cr -\threecol{{\bf posun o }}{{\bf dozadu}}{{\bf dopedu}} +\threecol{{\bf posun o }}{{\bf dozadu}}{{\bf dopedu}} \threecol{znak}{C-b}{C-f} \threecol{slovo}{M-b}{M-f} -\threecol{dek}{C-p}{C-n} -\threecol{na za葹tek nebo konec dku}{C-a}{C-e} -\threecol{vtu}{M-a}{M-e} +\threecol{叩dek}{C-p}{C-n} +\threecol{na za叩tek nebo konec 叩dku}{C-a}{C-e} +\threecol{vtu}{M-a}{M-e} \threecol{odstavec}{M-\{}{M-\}} -\threecol{strnku}{C-x [}{C-x ]} -\threecol{symbolick vraz}{C-M-b}{C-M-f} +\threecol{str叩nku}{C-x [}{C-x ]} +\threecol{symbolick箪 v箪raz}{C-M-b}{C-M-f} \threecol{funkci}{C-M-a}{C-M-e} -\threecol{na za葹tek nebo konec bufferu}{M-<}{M->} +\threecol{na za叩tek nebo konec bufferu}{M-<}{M->} } -\key{rolovat na dal麹 obrazovku}{C-v} -\key{rolovat na pedchoz obrazovku}{M-v} +\key{rolovat na dal邸鱈 obrazovku}{C-v} +\key{rolovat na pedchoz鱈 obrazovku}{M-v} \key{rolovat vlevo}{C-x <} \key{rolovat vpravo}{C-x >} -\key{aktuln dek do stedu obrazovky}{C-u C-l} +\key{aktu叩ln鱈 叩dek do stedu obrazovky}{C-u C-l} -\section{Ruen a mazn} +\section{Ru邸en鱈 a maz叩n鱈} \paralign to \hsize{#\tabskip=10pt plus 1 fil&#\tabskip=0pt&#\cr -\threecol{{\bf ruen objekt }}{{\bf dozadu}}{{\bf dopedu}} -\threecol{znak (mazn, ne ruen)}{DEL}{C-d} +\threecol{{\bf ru邸en箪 objekt }}{{\bf dozadu}}{{\bf dopedu}} +\threecol{znak (maz叩n鱈, ne ru邸en鱈)}{DEL}{C-d} \threecol{slovo}{M-DEL}{M-d} -\threecol{dek (do konce)}{M-0 C-k}{C-k} -\threecol{vta}{C-x DEL}{M-k} -\threecol{symbolick vraz}{M-- C-M-k}{C-M-k} +\threecol{叩dek (do konce)}{M-0 C-k}{C-k} +\threecol{vta}{C-x DEL}{M-k} +\threecol{symbolick箪 v箪raz}{M-- C-M-k}{C-M-k} } -\key{zruit {\bf oblast}}{C-w} -\key{zkoprovat oblast do schrnky}{M-w} -\key{zruit a po nejbli捷 vskyt znaku {\it znak}}{M-z {\it znak}} +\key{zru邸it {\bf oblast}}{C-w} +\key{zkop鱈rovat oblast do schr叩nky}{M-w} +\key{zru邸it a転 po nejbli転邸鱈 v箪skyt znaku {\it znak}}{M-z {\it znak}} -\key{vhodit naposledy zruen objekt}{C-y} -\key{nahradit vhozen objekt pedchozm zruenm}{M-y} +\key{vhodit naposledy zru邸en箪 objekt}{C-y} +\key{nahradit vhozen箪 objekt pedchoz鱈m zru邸en箪m}{M-y} -\section{Oznaovn} +\section{Oznaov叩n鱈} -\key{vloit znaku}{C-@ {\it n.} C-SPC} -\key{prohodit kurzor a znaku}{C-x C-x} +\key{vlo転it znaku}{C-@ {\it n.} C-SPC} +\key{prohodit kurzor a znaku}{C-x C-x} -\key{oznait zadan poet {\bf slov}}{M-@} -\key{oznait {\bf odstavec}}{M-h} -\key{oznait {\bf strnku}}{C-x C-p} -\key{oznait {\bf symbolick vraz}}{C-M-@} -\key{oznait {\bf funkci}}{C-M-h} -\key{oznait cel {\bf buffer}}{C-x h} +\key{oznait zadan箪 poet {\bf slov}}{M-@} +\key{oznait {\bf odstavec}}{M-h} +\key{oznait {\bf str叩nku}}{C-x C-p} +\key{oznait {\bf symbolick箪 v箪raz}}{C-M-@} +\key{oznait {\bf funkci}}{C-M-h} +\key{oznait cel箪 {\bf buffer}}{C-x h} -\section{Interaktivn nahrazovn} +\section{Interaktivn鱈 nahrazov叩n鱈} -\key{interaktivn nahradit textov etzec}{M-\%} -\metax{s~uitm regulrnho vrazu}{M-x query-replace-regexp} +\key{interaktivn nahradit textov箪 etzec}{M-\%} +\metax{s~u転it鱈m regul叩rn鱈ho v箪razu}{M-x query-replace-regexp} -Platn odpovdi v~mdu query-replace jsou +Platn辿 odpovdi v~m坦du query-replace jsou -\key{{\bf zmnu provst} a jt na dal麹}{SPC} -\key{zmnu provst a zstat na mst}{,} -\key{{\bf skoit} na dal麹 bez proveden zmny}{DEL} -\key{zamnit vechny zbvajc vskyty}{!} -\key{{\bf zpt} na pedchoz vskyt etzce}{^} -\key{{\bf konec} nahrazovn}{RET} -\key{rekurzivn editace (ukon蓁 se \kbd{C-M-c})}{C-r} +\key{{\bf z叩mnu prov辿st} a j鱈t na dal邸鱈}{SPC} +\key{z叩mnu prov辿st a z哲stat na m鱈st}{,} +\key{{\bf skoit} na dal邸鱈 bez proveden鱈 z叩mny}{DEL} +\key{zamnit v邸echny zb箪vaj鱈c鱈 v箪skyty}{!} +\key{{\bf zpt} na pedchoz鱈 v箪skyt etzce}{^} +\key{{\bf konec} nahrazov叩n鱈}{RET} +\key{rekurzivn鱈 editace (ukon鱈 se \kbd{C-M-c})}{C-r} \section{Okna} -Jestlie jsou zobrazeny dva pkazy, pak ten druh plat pro X okno. +Jestli転e jsou zobrazeny dva p鱈kazy, pak ten druh箪 plat鱈 pro X okno. -\key{zruit vechna ostatn okna}{C-x 1} +\key{zru邸it v邸echna ostatn鱈 okna}{C-x 1} {\setbox0=\hbox{\kbd{0}}\advance\hsize by 0\wd0 \paralign to \hsize{#\tabskip=10pt plus 1 fil&#\tabskip=0pt&#\cr -\threecol{rozdlit okno na horn a doln}{C-x 2\ \ \ \ }{C-x 5 2} -\threecol{zruit toto okno}{C-x 0\ \ \ \ }{C-x 5 0} +\threecol{rozdlit okno na horn鱈 a doln鱈}{C-x 2\ \ \ \ }{C-x 5 2} +\threecol{zru邸it toto okno}{C-x 0\ \ \ \ }{C-x 5 0} }} -\key{rozdlit okno na lev a prav}{C-x 3} +\key{rozdlit okno na lev辿 a prav辿}{C-x 3} -\key{rolovat jin okno}{C-M-v} +\key{rolovat jin辿 okno}{C-M-v} {\setbox0=\hbox{\kbd{0}}\advance\hsize by 2\wd0 \paralign to \hsize{#\tabskip=10pt plus 1 fil&#\tabskip=0pt&#\cr -\threecol{pepnout kurzor do jinho okna}{C-x o}{C-x 5 o} - -\threecol{vybrat buffer v~jinm okn}{C-x 4 b}{C-x 5 b} -\threecol{zobrazit buffer v~jinm okn}{C-x 4 C-o}{C-x 5 C-o} -\threecol{otevt soubor v~jinm okn}{C-x 4 f}{C-x 5 f} -\threecol{otevt soubor jen pro ten v~jinm okn}{C-x 4 r}{C-x 5 r} -\threecol{spustit Dired v~jinm okn}{C-x 4 d}{C-x 5 d} -\threecol{najt tag v~jinm okn}{C-x 4 .}{C-x 5 .} +\threecol{pepnout kurzor do jin辿ho okna}{C-x o}{C-x 5 o} + +\threecol{vybrat buffer v~jin辿m okn}{C-x 4 b}{C-x 5 b} +\threecol{zobrazit buffer v~jin辿m okn}{C-x 4 C-o}{C-x 5 C-o} +\threecol{otev鱈t soubor v~jin辿m okn}{C-x 4 f}{C-x 5 f} +\threecol{otev鱈t soubor jen pro ten鱈 v~jin辿m okn}{C-x 4 r}{C-x 5 r} +\threecol{spustit Dired v~jin辿m okn}{C-x 4 d}{C-x 5 d} +\threecol{naj鱈t tag v~jin辿m okn}{C-x 4 .}{C-x 5 .} }} -\key{zvtit okno}{C-x ^} -\key{zit okno}{C-x \{} -\key{roz麹it okno}{C-x \}} +\key{zvt邸it okno}{C-x ^} +\key{z炭転it okno}{C-x \{} +\key{roz邸鱈it okno}{C-x \}} -\section{Formtovn} +\section{Form叩tov叩n鱈} -\key{odsadit aktuln {\bf dek} (dle mdu)}{TAB} -\key{odsadit {\bf oblast} (dle mdu)}{C-M-\\} -\key{odsadit {\bf symbolick vraz} (dle mdu)}{C-M-q} -\key{odsadit oblast napevno o~{\it argument\/} sloupc}{C-x TAB} +\key{odsadit aktu叩ln鱈 {\bf 叩dek} (dle m坦du)}{TAB} +\key{odsadit {\bf oblast} (dle m坦du)}{C-M-\\} +\key{odsadit {\bf symbolick箪 v箪raz} (dle m坦du)}{C-M-q} +\key{odsadit oblast napevno o~{\it argument\/} sloupc哲}{C-x TAB} -\key{vloit znak novho dku za kurzor}{C-o} -\key{posunout zbytek dku svisle dol}{C-M-o} -\key{smazat przdn dky okolo kurzoru}{C-x C-o} -\key{spojit dek s~pedchozm (s~arg.~s~nsl.)}{M-^} -\key{smazat przdn msto kolem kurzoru}{M-\\} -\key{nechat pesn jednu mezeru kolem kurzoru}{M-SPC} +\key{vlo転it znak nov辿ho 叩dku za kurzor}{C-o} +\key{posunout zbytek 叩dku svisle dol哲}{C-M-o} +\key{smazat pr叩zdn辿 叩dky okolo kurzoru}{C-x C-o} +\key{spojit 叩dek s~pedchoz鱈m (s~arg.~s~n叩sl.)}{M-^} +\key{smazat pr叩zdn辿 m鱈sto kolem kurzoru}{M-\\} +\key{nechat pesn jednu mezeru kolem kurzoru}{M-SPC} \key{zalomit odstavec}{M-q} -\key{nastavit sloupec pro zalamovn}{C-x f} -\key{nastavit prefix, kterm za蓁naj dky}{C-x .} +\key{nastavit sloupec pro zalamov叩n鱈}{C-x f} +\key{nastavit prefix, kter箪m za鱈naj鱈 叩dky}{C-x .} \key{nastavit font}{M-g} -\section{Zmna velikosti psmen} +\section{Zmna velikosti p鱈smen} -\key{zmnit psmena slova na velk}{M-u} -\key{zmnit psmena slova na mal}{M-l} -\key{zmnit po葹ten psmeno slova na velk}{M-c} +\key{zmnit p鱈smena slova na velk叩}{M-u} +\key{zmnit p鱈smena slova na mal叩}{M-l} +\key{zmnit po叩ten鱈 p鱈smeno slova na velk辿}{M-c} -\key{zmnit psmena oblasti na velk}{C-x C-u} -\key{zmnit psmena oblasti na mal}{C-x C-l} +\key{zmnit p鱈smena oblasti na velk叩}{C-x C-u} +\key{zmnit p鱈smena oblasti na mal叩}{C-x C-l} \section{Minibuffer} -Nsledujc klvesy jsou platn pro minibuffer. +N叩sleduj鱈c鱈 kl叩vesy jsou platn辿 pro minibuffer. -\key{doplnit z~nabdky}{TAB} -\key{doplnit do nejbli捷ho slova}{SPC} +\key{doplnit z~nab鱈dky}{TAB} +\key{doplnit do nejbli転邸鱈ho slova}{SPC} \key{doplnit a vykonat}{RET} -\key{zobrazit mon doplnn}{?} -\key{pedchoz pkaz z~minibufferu}{M-p} -\key{novj麹 nebo implicitn pkaz z~minibufferu}{M-n} -\key{vyhledat regulrn vraz v~historii vzad}{M-r} -\key{vyhledat regulrn vraz v~historii vped}{M-s} -\key{zruit pkaz}{C-g} +\key{zobrazit mo転n叩 doplnn鱈}{?} +\key{pedchoz鱈 p鱈kaz z~minibufferu}{M-p} +\key{novj邸鱈 nebo implicitn鱈 p鱈kaz z~minibufferu}{M-n} +\key{vyhledat regul叩rn鱈 v箪raz v~historii vzad}{M-r} +\key{vyhledat regul叩rn鱈 v箪raz v~historii vped}{M-s} +\key{zru邸it p鱈kaz}{C-g} -Stisknte \kbd{C-x ESC ESC} pro editaci a zopakovn poslednho pkazu -z~minibufferu. Stisknte \kbd{F10} pro aktivaci menu v~minibufferu. +Stisknte \kbd{C-x ESC ESC} pro editaci a zopakov叩n鱈 posledn鱈ho p鱈kazu +z~minibufferu. Stisknte \kbd{F10} pro aktivaci menu v~minibufferu. \newcolumn -\title{GNU Emacs -- Referenn karta} +\title{GNU Emacs -- Referenn鱈 karta} \section{Buffery} -\key{vybrat jin buffer}{C-x b} -\key{seznam vech buffer}{C-x C-b} -\key{zruit buffer}{C-x k} +\key{vybrat jin箪 buffer}{C-x b} +\key{seznam v邸ech buffer哲}{C-x C-b} +\key{zru邸it buffer}{C-x k} -\section{Vmny} +\section{V箪mny} -\key{pehodit {\bf znaky}}{C-t} -\key{pehodit {\bf slova}}{M-t} -\key{pehodit {\bf dky}}{C-x C-t} -\key{pehodit {\bf symbolick vrazy}}{C-M-t} +\key{pehodit {\bf znaky}}{C-t} +\key{pehodit {\bf slova}}{M-t} +\key{pehodit {\bf 叩dky}}{C-x C-t} +\key{pehodit {\bf symbolick辿 v箪razy}}{C-M-t} \section{Kontrola pravopisu} -\key{kontrola pravopisu aktulnho slova}{M-\$} -\metax{kontrola pravopisu vech slov v oblasti}{M-x ispell-region} -\metax{kontrola pravopisu celho bufferu}{M-x ispell-buffer} +\key{kontrola pravopisu aktu叩ln鱈ho slova}{M-\$} +\metax{kontrola pravopisu v邸ech slov v oblasti}{M-x ispell-region} +\metax{kontrola pravopisu cel辿ho bufferu}{M-x ispell-buffer} \section{Tagy} -\key{najt tag (definici)}{M-.} -\key{najt dal麹 vskyt tagu}{C-u M-.} -\metax{zadat soubor s novmi tagy}{M-x visit-tags-table} +\key{naj鱈t tag (definici)}{M-.} +\key{naj鱈t dal邸鱈 v箪skyt tagu}{C-u M-.} +\metax{zadat soubor s nov箪mi tagy}{M-x visit-tags-table} -\metax{vyhledat reg.\ vraz v~souborech s~tagy}{M-x tags-search} -\metax{spustit nahrazovn pro ony soubory}{M-x tags-query-replace} -\key{pokraovat v~prohledvn nebo nahrazovn}{M-,} +\metax{vyhledat reg.\ v箪raz v~souborech s~tagy}{M-x tags-search} +\metax{spustit nahrazov叩n鱈 pro ony soubory}{M-x tags-query-replace} +\key{pokraovat v~prohled叩v叩n鱈 nebo nahrazov叩n鱈}{M-,} -\section{Pkazov interpret} +\section{P鱈kazov箪 interpret} -\key{vykonat shellov pkaz}{M-!} -\key{vykonat shellov pkaz na oblast}{M-|} -\key{zfiltrovat oblast shellovm pkazem}{C-u M-|} -\key{spustit shell v okn \kbd{*shell*}}{M-x shell} +\key{vykonat shellov箪 p鱈kaz}{M-!} +\key{vykonat shellov箪 p鱈kaz na oblast}{M-|} +\key{zfiltrovat oblast shellov箪m p鱈kazem}{C-u M-|} +\key{spustit shell v okn \kbd{*shell*}}{M-x shell} -\section{Obdlnky} +\section{Obd辿ln鱈ky} -\key{zkoprovat obdlnk do registru}{C-x r r} -\key{zruit obdlnk}{C-x r k} -\key{vhodit obdlnk}{C-x r y} -\key{vloit obdlnk mezer}{C-x r o} -\key{nahradit obdlnk obdlnkem mezer}{C-x r c} -\key{nahradit dky obdlnku zadanm etzcem}{C-x r t} +\key{zkop鱈rovat obd辿ln鱈k do registru}{C-x r r} +\key{zru邸it obd辿ln鱈k}{C-x r k} +\key{vhodit obd辿ln鱈k}{C-x r y} +\key{vlo転it obd辿ln鱈k mezer}{C-x r o} +\key{nahradit obd辿ln鱈k obd辿ln鱈kem mezer}{C-x r c} +\key{nahradit 叩dky obd辿ln鱈ku zadan箪m etzcem}{C-x r t} \section{Zkratky} -\key{pidat globln zkratku}{C-x a g} -\key{pidat lokln zkratku}{C-x a l} -\key{pidat globln expanzi pro zkratku }{C-x a i g} -\key{pidat lokln expanzi pro zkratku}{C-x a i l} +\key{pidat glob叩ln鱈 zkratku}{C-x a g} +\key{pidat lok叩ln鱈 zkratku}{C-x a l} +\key{pidat glob叩ln鱈 expanzi pro zkratku }{C-x a i g} +\key{pidat lok叩ln鱈 expanzi pro zkratku}{C-x a i l} \key{expandovat zkratku}{C-x a e} -\key{dynamick expanze pedchzejcho slova}{M-/} +\key{dynamick叩 expanze pedch叩zej鱈c鱈ho slova}{M-/} -\section{Regulrn vrazy} +\section{Regul叩rn鱈 v箪razy} -\key{libovoln znak krom novho dku}{. {\rm(teka)}} -\key{鍾dn nebo nkolik opakovn}{*} -\key{jedno nebo vce opakovn}{+} -\key{鍾dn nebo jedno opakovn}{?} -\key{zruit zvl畊tn vznam znaku {\it c\/} ve vrazu}{\\{\it c}} +\key{libovoln箪 znak krom nov辿ho 叩dku}{. {\rm(teka)}} +\key{転叩dn辿 nebo nkolik opakov叩n鱈}{*} +\key{jedno nebo v鱈ce opakov叩n鱈}{+} +\key{転叩dn辿 nebo jedno opakov叩n鱈}{?} +\key{zru邸it zvl叩邸tn鱈 v箪znam znaku {\it c\/} ve v箪razu}{\\{\it c}} \key{alternativa (\uv{nebo})}{\\|} \key{skupina}{\\( {\rm$\ldots$} \\)} -\key{stejn text jako {\it n\/}-t skupina}{\\{\it n}} +\key{stejn箪 text jako {\it n\/}-t叩 skupina}{\\{\it n}} \key{hranice slova}{\\b} \key{nikoliv hranice slova}{\\B} \paralign to \hsize{#\tabskip=10pt plus 1 fil&#\tabskip=0pt&#\cr -\threecol{{\bf element}}{{\bf za葹tek}}{{\bf konec}} -\threecol{dek}{^}{\$} +\threecol{{\bf element}}{{\bf za叩tek}}{{\bf konec}} +\threecol{叩dek}{^}{\$} \threecol{slovo}{\\<}{\\>} \threecol{buffer}{\\`}{\\'} -\threecol{{\bf tda znak}}{{\bf odpovd}}{{\bf neodpovd}} -\threecol{explicitn mnoina}{[ {\rm$\ldots$} ]}{[^ {\rm$\ldots$} ]} -\threecol{slovotvorn znak}{\\w}{\\W} -\threecol{znak se syntax {\it c}}{\\s{\it c}}{\\S{\it c}} +\threecol{{\bf t鱈da znak哲}}{{\bf odpov鱈d叩}}{{\bf neodpov鱈d叩}} +\threecol{explicitn鱈 mno転ina}{[ {\rm$\ldots$} ]}{[^ {\rm$\ldots$} ]} +\threecol{slovotvorn箪 znak}{\\w}{\\W} +\threecol{znak se syntax鱈 {\it c}}{\\s{\it c}}{\\S{\it c}} } -\section{Mezinrodn znakov sady} +\section{Mezin叩rodn鱈 znakov辿 sady} -\metax{zadat hlavn jazyk}{M-x set-language-environment} -\metax{zobrazit vechny vstupn metody}{M-x list-input-methods} -\key{zapnout nebo vypnout vstupn metodu}{C-\\} -\key{zadat kdovn pro nsledujc pkaz}{C-x RET c} -\metax{zobrazit vechna kdovn}{M-x list-coding-systems} -\metax{zmnit preferovan kdovn}{M-x prefer-coding-system} +\metax{zadat hlavn鱈 jazyk}{M-x set-language-environment} +\metax{zobrazit v邸echny vstupn鱈 metody}{M-x list-input-methods} +\key{zapnout nebo vypnout vstupn鱈 metodu}{C-\\} +\key{zadat k坦dov叩n鱈 pro n叩sleduj鱈c鱈 p鱈kaz}{C-x RET c} +\metax{zobrazit v邸echna k坦dov叩n鱈}{M-x list-coding-systems} +\metax{zmnit preferovan辿 k坦dov叩n鱈}{M-x prefer-coding-system} \section{Info} \key{spustit Info}{C-h i} -\key{najt zadanou funkci nebo promnnou v~Info}{C-h C-i} +\key{naj鱈t zadanou funkci nebo promnnou v~Info}{C-h C-i} \beginindentedkeys -Pohyb uvnit uzl: +Pohyb uvnit uzl哲: -\key{rolovn vped}{SPC} -\key{rolovn zpt}{DEL} -\key{na za葹tek uzlu}{. {\rm (teka)}} +\key{rolov叩n鱈 vped}{SPC} +\key{rolov叩n鱈 zpt}{DEL} +\key{na za叩tek uzlu}{. {\rm (teka)}} Pohyb mezi uzly: -\key{{\bf dal麹} uzel}{n} -\key{{\bf pedchoz} uzel}{p} -\key{{\bf nadazen} uzel}{u} -\key{vybrat z~menu podle nzvu}{m} -\key{vybrat {\it n\/}-tou poloku menu (1--9)}{{\it n}} -\key{nejbli捷 p躪t k躱ov odkaz (nvrat \kbd{l})}{f} -\key{vrtit se do naposledy prohl躱enho uzlu}{l} -\key{vrtit se do adres癢e uzl}{d} -\key{pejt do kterhokoliv uzlu podle jmna}{g} +\key{{\bf dal邸鱈} uzel}{n} +\key{{\bf pedchoz鱈} uzel}{p} +\key{{\bf nadazen箪} uzel}{u} +\key{vybrat z~menu podle n叩zvu}{m} +\key{vybrat {\it n\/}-tou polo転ku menu (1--9)}{{\it n}} +\key{nejbli転邸鱈 p鱈邸t鱈 k鱈転ov箪 odkaz (n叩vrat \kbd{l})}{f} +\key{vr叩tit se do naposledy prohl鱈転en辿ho uzlu}{l} +\key{vr叩tit se do adres叩e uzl哲}{d} +\key{pej鱈t do kter辿hokoliv uzlu podle jm辿na}{g} -Dal麹: +Dal邸鱈: -\key{spustit {\bf tutoril} k~Info}{h} +\key{spustit {\bf tutori叩l} k~Info}{h} % \key{look up a subject in the indices}{i} % FIXME -\key{prohledat uzly na etzec}{M-s} -\key{{\bf ukonit} Info}{q} +\key{prohledat uzly na etzec}{M-s} +\key{{\bf ukonit} Info}{q} \endindentedkeys \section{Registry} -\key{uloit oblast do registru}{C-x r s} -\key{vloit obsah registru do bufferu}{C-x r i} +\key{ulo転it oblast do registru}{C-x r s} +\key{vlo転it obsah registru do bufferu}{C-x r i} -\key{uloit pozici kurzoru do registru}{C-x r SPC} -\key{skoit na pozici uloenou v~registru}{C-x r j} +\key{ulo転it pozici kurzoru do registru}{C-x r SPC} +\key{skoit na pozici ulo転enou v~registru}{C-x r j} -\section{Klvesov makra} +\section{Kl叩vesov叩 makra} -\key{{\bf zahjit} definovn klvesovho makra}{C-x (} -\key{{\bf zakonit} definovn klvesovho makra}{C-x )} -\key{{\bf vykonat} posledn definovan makro}{C-x e} -\key{pipojit k~poslednmu klvesovmu makru}{C-u C-x (} -\metax{pojmenovat posledn makro}{M-x name-last-kbd-macro} -\metax{vloit do bufferu lispovou definici}{M-x insert-kbd-macro} +\key{{\bf zah叩jit} definov叩n鱈 kl叩vesov辿ho makra}{C-x (} +\key{{\bf zakonit} definov叩n鱈 kl叩vesov辿ho makra}{C-x )} +\key{{\bf vykonat} posledn鱈 definovan辿 makro}{C-x e} +\key{pipojit k~posledn鱈mu kl叩vesov辿mu makru}{C-u C-x (} +\metax{pojmenovat posledn鱈 makro}{M-x name-last-kbd-macro} +\metax{vlo転it do bufferu lispovou definici}{M-x insert-kbd-macro} -\section{Pkazy souvisejc s~Emacs Lispem} +\section{P鱈kazy souvisej鱈c鱈 s~Emacs Lispem} -\key{vyhodnotit {\bf vraz} ped kurzorem}{C-x C-e} +\key{vyhodnotit {\bf v箪raz} ped kurzorem}{C-x C-e} \key{vyhodnotit {\bf funkci} pod kurzorem}{C-M-x} \metax{vyhodnotit {\bf oblast}}{M-x eval-region} -\key{na蓁st a vyhodnotit vraz v~minibufferu}{M-:} -\metax{na蓁st soubor ze systmovho adres癢e}{M-x load-library} +\key{na鱈st a vyhodnotit v箪raz v~minibufferu}{M-:} +\metax{na鱈st soubor ze syst辿mov辿ho adres叩e}{M-x load-library} -\section{Jednoduch pizpsoben} +\section{Jednoduch叩 pizp哲soben鱈} -\metax{nastavit promnn a faces}{M-x customize} +\metax{nastavit promnn辿 a faces}{M-x customize} % The intended audience here is the person who wants to make simple % customizations and knows Lisp syntax. -Definice obecn klvesov zkratky v~Emacs Lispu (pklad): +Definice obecn辿 kl叩vesov辿 zkratky v~Emacs Lispu (p鱈klad): \beginexample% (global-set-key "\\C-cg" 'goto-line) (global-set-key "\\M-\#" 'query-replace-regexp) \endexample -\section{Zpis pkaz} +\section{Z叩pis p鱈kaz哲} \beginexample% (defun \ (\) @@ -645,7 +640,7 @@ Definice obecn \) \endexample -Pklad: +P鱈klad: \beginexample% (defun this-line-to-top-of-window (line) @@ -657,8 +652,8 @@ With ARG, put point on line ARG." (prefix-numeric-value line)))) \endexample -Specifikace \kbd{interactive} k, jak interaktivn na蓁st ar\-gu\-men\-ty. -Vce se dozvte po proveden \kbd{C-h f interactive}. +Specifikace \kbd{interactive} 鱈k叩, jak interaktivn na鱈st ar\-gu\-men\-ty. +V鱈ce se dozv鱈te po proveden鱈 \kbd{C-h f interactive}. \copyrightnotice @@ -666,5 +661,4 @@ V % Local variables: % compile-command: "csplain cs-refcard" -% coding: iso-latin-2 % End: diff --git a/etc/refcards/cs-survival.tex b/etc/refcards/cs-survival.tex index 75235ed..fbce80a 100644 --- a/etc/refcards/cs-survival.tex +++ b/etc/refcards/cs-survival.tex @@ -3,7 +3,7 @@ % Copyright (C) 2000-2014 Free Software Foundation, Inc. % Author: Wlodek Bzyl -% Czech translation: Pavel Jank , March 2001 +% Czech translation: Pavel Jan鱈k , March 2001 % This file is part of GNU Emacs. @@ -54,11 +54,6 @@ % Czech hyphenation rules applied \chyph -% Without this, pdfTeX 3.1415926-2.5-1.40.14 (TeX Live 2013/Debian) -% aborts with: "! UTF-8 INPUT IS CORRUPTED ! -% May be you are using another input encoding" -\input utf8off - \input emacsver.tex \def\copyrightnotice{\penalty-1\vfill @@ -66,11 +61,11 @@ Copyright \copyright\ \year\ Free Software Foundation, Inc.\break Pro GNU Emacs \versionemacs\break W{\l}odek Bzyl (matwb@univ.gda.pl)\break - Do etiny peloil Pavel Jank (Pavel@Janik.cz) + Do e邸tiny pelo転il Pavel Jan鱈k (Pavel@Janik.cz) - Kopie tohoto dokumentu mete vytv癢et a 麹it - za pedpokladu, e budou obsahovat tuto poznmku - o autorskch prvech.\par}} + Kopie tohoto dokumentu m哲転ete vytv叩et a 邸鱈it + za pedpokladu, 転e budou obsahovat tuto pozn叩mku + o autorsk箪ch pr叩vech.\par}} \hsize 3.2in \vsize 7.95in @@ -173,243 +168,243 @@ %**end of header -\title{Karta\ \ pro\ \ peit\ \ s\ \ GNU\ \ Emacsem}{pro verzi \versionemacs} +\title{Karta\ \ pro\ \ pe転it鱈\ \ s\ \ GNU\ \ Emacsem}{pro verzi \versionemacs} -V~nsledujcm textu \kbd{C-z} znamen: stisknte klvesu `\kbd{z}' a -souasn pidrte stisknutou klvesu {\it Ctrl}. \kbd{M-z} znamen, e -souasn s klvesou `\kbd{z}' pidr壌te klvesu {\it Meta\/} (vtinou -oznaenou {\it Alt\/}) nebo ji stisknete po stisknut klvesy {\it Esc\/}. +V~n叩sleduj鱈c鱈m textu \kbd{C-z} znamen叩: stisknte kl叩vesu `\kbd{z}' a +souasn pidr転te stisknutou kl叩vesu {\it Ctrl}. \kbd{M-z} znamen叩, 転e +souasn s kl叩vesou `\kbd{z}' pidr転鱈te kl叩vesu {\it Meta\/} (vt邸inou +oznaenou {\it Alt\/}) nebo ji stisknete po stisknut鱈 kl叩vesy {\it Esc\/}. -\section{Sputn Emacsu} +\section{Spu邸tn鱈 Emacsu} -Pro sputn GNU Emacsu jednodue napite jeho jmno: \kbd{emacs}. -Emacs rozdluje rmec na nkolik 葹st: - dek menu, - buffer s editovanm textem, - tzv. mode line popisujc buffer nad n - a minibuffer v posledn dce. +Pro spu邸tn鱈 GNU Emacsu jednodu邸e napi邸te jeho jm辿no: \kbd{emacs}. +Emacs rozdluje r叩mec na nkolik 叩st鱈: + 叩dek menu, + buffer s editovan箪m textem, + tzv. mode line popisuj鱈c鱈 buffer nad n鱈 + a minibuffer v posledn鱈 叩dce. \askip -\key{C-x C-c} ukonen Emacsu -\key{C-x C-f} editace souboru; tento pkaz vyu壌v minibuffer k peten - jmna souboru; tento pkaz pouijte i tehdy, chcete-li - vytvoit nov soubor zadanho jmna -\key{C-x C-s} uloit soubor -\key{C-x k} zavt buffer -\key{C-g} ve vtin situac: zastaven aktuln provdn innosti, - zruen zadvn pkazu apod. +\key{C-x C-c} ukonen鱈 Emacsu +\key{C-x C-f} editace souboru; tento p鱈kaz vyu転鱈v叩 minibuffer k peten鱈 + jm辿na souboru; tento p鱈kaz pou転ijte i tehdy, chcete-li + vytvoit nov箪 soubor zadan辿ho jm辿na +\key{C-x C-s} ulo転it soubor +\key{C-x k} zav鱈t buffer +\key{C-g} ve vt邸in situac鱈: zastaven鱈 aktu叩ln prov叩dn辿 innosti, + zru邸en鱈 zad叩v叩n鱈 p鱈kazu apod. \key{C-x u} obnovit \section{Pohyb} -\key{C-l} pesun aktuln dky do stedu okna -\key{C-x b} pepnut do jinho bufferu -\key{M-<} pesun na za葹tek bufferu -\key{M->} pesun na konec bufferu -\key{M-x goto-line} pesun na dek zadanho 蓁sla +\key{C-l} pesun aktu叩ln鱈 叩dky do stedu okna +\key{C-x b} pepnut鱈 do jin辿ho bufferu +\key{M-<} pesun na za叩tek bufferu +\key{M->} pesun na konec bufferu +\key{M-x goto-line} pesun na 叩dek zadan辿ho 鱈sla -\section{Vce oken} +\section{V鱈ce oken} -\key{C-x 0} odstrann aktulnho okna -\key{C-x 1} aktuln okno se stane jedinm oknem -\key{C-x 2} rozdlen okna horizontln -\key{C-x 3} rozdlen okna vertikln -\key{C-x o} pesun do jinho okna +\key{C-x 0} odstrann鱈 aktu叩ln鱈ho okna +\key{C-x 1} aktu叩ln鱈 okno se stane jedin箪m oknem +\key{C-x 2} rozdlen鱈 okna horizont叩ln +\key{C-x 3} rozdlen鱈 okna vertik叩ln +\key{C-x o} pesun do jin辿ho okna \section{Regiony} -Emacs definuje `region' jako prostor mezi {\it znakou\/} a -{\it bodem}. Znaka je nastavena pomoc \kbd{C-{\it space}}. -Bod je v mst aktuln pozice kurzoru. +Emacs definuje `region' jako prostor mezi {\it znakou\/} a +{\it bodem}. Znaka je nastavena pomoc鱈 \kbd{C-{\it space}}. +Bod je v m鱈st aktu叩ln鱈 pozice kurzoru. \askip -\key{M-h} ozna cel odstavec -\key{C-x h} ozna cel buffer +\key{M-h} ozna cel箪 odstavec +\key{C-x h} ozna cel箪 buffer -\section{Vyjmut a koprovn} +\section{Vyjmut鱈 a kop鱈rov叩n鱈} \key{C-w} vyjmi region -\key{M-w} zkopruj region do kill-ringu -\key{C-k} vyjmi text od kurzoru do konce dku +\key{M-w} zkop鱈ruj region do kill-ringu +\key{C-k} vyjmi text od kurzoru do konce 叩dku \key{M-DEL} vyjmi slovo -\key{C-y} vlo zpt posledn vyjmut text (kombinace klves \kbd{C-w C-y} - me bt pouita pro pesuny text) -\key{M-y} nahra posledn vloen text pedchozm vyjmutm textem +\key{C-y} vlo転 zpt posledn鱈 vyjmut箪 text (kombinace kl叩ves \kbd{C-w C-y} + m哲転e b箪t pou転ita pro pesuny text哲) +\key{M-y} nahra posledn鱈 vlo転en箪 text pedchoz鱈m vyjmut箪m textem -\section{Vyhledvn} +\section{Vyhled叩v叩n鱈} -\key{C-s} hledej etzec -\key{C-r} hledej etzec zpt -\key{RET} ukoni hledn -\key{M-C-s} hledej regulrn vraz -\key{M-C-r} hledej regulrn vraz zpt +\key{C-s} hledej etzec +\key{C-r} hledej etzec zpt +\key{RET} ukoni hled叩n鱈 +\key{M-C-s} hledej regul叩rn鱈 v箪raz +\key{M-C-r} hledej regul叩rn鱈 v箪raz zpt \askip -Kombinace \kbd{C-s} nebo \kbd{C-r} mete pou壌t i k opakovn hledn -jinm smrem. +Kombinace \kbd{C-s} nebo \kbd{C-r} m哲転ete pou転鱈t i k opakov叩n鱈 hled叩n鱈 +jin箪m smrem. -\section{Znaky (tags)} +\section{Znaky (tags)} -Tabulky znaek (tags) zaznamenvaj polohu funkc a procedur, globlnch -promnnch, datovch typ a dal麹ho. Pro vytvoen tabulky znaek spuste -pkaz `{\tt etags} {\it vstupn\_soubory}' v pkazovm interpretu. +Tabulky znaek (tags) zaznamen叩vaj鱈 polohu funkc鱈 a procedur, glob叩ln鱈ch +promnn箪ch, datov箪ch typ哲 a dal邸鱈ho. Pro vytvoen鱈 tabulky znaek spus泥te +p鱈kaz `{\tt etags} {\it vstupn鱈\_soubory}' v p鱈kazov辿m interpretu. \askip \key{M-.} najdi definici -\key{C-u M-.} najdi dal麹 vskyt definice -\key{M-*} b貍 tam, odkud byla volna posledn \kbd{M-.} -\mkey{M-x tags-query-replace} spus query-replace na vech souborech -zaznamenanch v tabulce znaek. -\key{M-,} pokrauj v poslednm hledn znaky nebo query-replace - -\section{Peklady} - -\key{M-x compile} pelo kd v aktivnm okn -\key{C-c C-c} b貍 na posledn chybu pekladae, v okn pekladu -\key{C-x `} v okn se zdrojovm textem - -\section{Dired, editor adres癢} - -\key{C-x d} spus Dired -\key{d} ozna tento soubor pro smazn -\key{\~{}} ozna vechny zlohy ke smazn -\key{u} odstra vechny znaky pro smazn -\key{x} sma soubory oznaen pro smazn -\key{C} kopruj soubor +\key{C-u M-.} najdi dal邸鱈 v箪skyt definice +\key{M-*} b転 tam, odkud byla vol叩na posledn鱈 \kbd{M-.} +\mkey{M-x tags-query-replace} spus泥 query-replace na v邸ech souborech +zaznamenan箪ch v tabulce znaek. +\key{M-,} pokrauj v posledn鱈m hled叩n鱈 znaky nebo query-replace + +\section{Peklady} + +\key{M-x compile} pelo転 k坦d v aktivn鱈m okn +\key{C-c C-c} b転 na posledn鱈 chybu pekladae, v okn pekladu +\key{C-x `} v okn se zdrojov箪m textem + +\section{Dired, editor adres叩哲} + +\key{C-x d} spus泥 Dired +\key{d} ozna tento soubor pro smaz叩n鱈 +\key{\~{}} ozna v邸echny z叩lohy ke smaz叩n鱈 +\key{u} odstra v邸echny znaky pro smaz叩n鱈 +\key{x} sma転 soubory oznaen辿 pro smaz叩n鱈 +\key{C} kop鱈ruj soubor \key{g} obnov buffer Diredu -\key{f} navtiv soubor v aktuln dce -\key{s} pepni mezi azenm podle abecedy a data/asu +\key{f} nav邸tiv soubor v aktu叩ln鱈 叩dce +\key{s} pepni mezi azen鱈m podle abecedy a data/asu -\section{ten a posln poty} +\section{ten鱈 a pos鱈l叩n鱈 po邸ty} -\key{M-x rmail} zani 蓁st potu -\key{q} ukoni ten poty -\key{h} uka hlaviky -\key{d} ozna aktuln zprvu ke smazn -\key{x} sma vechny zprvy oznaen ke smazn +\key{M-x rmail} zani 鱈st po邸tu +\key{q} ukoni ten鱈 po邸ty +\key{h} uka転 hlaviky +\key{d} ozna aktu叩ln鱈 zpr叩vu ke smaz叩n鱈 +\key{x} sma転 v邸echny zpr叩vy oznaen辿 ke smaz叩n鱈 -\key{C-x m} nov zprva -\key{C-c C-c} poli zprvu a pepni do jinho bufferu -\key{C-c C-f C-c} pesu se na hlaviku `CC' a pokud neexistuje, tak ji -vytvo +\key{C-x m} nov叩 zpr叩va +\key{C-c C-c} po邸li zpr叩vu a pepni do jin辿ho bufferu +\key{C-c C-f C-c} pesu se na hlaviku `CC' a pokud neexistuje, tak ji +vytvo -\section{Rzn} +\section{R哲zn辿} \key{M-q} zarovnej odstavec -\key{M-/} dopl dynamicky pedchoz slovo -\key{C-z} ikonizuj (peru) Emacs -\mkey{M-x revert-buffer} nahra text editovanho souboru tmt蘊 souborem z disku +\key{M-/} dopl dynamicky pedchoz鱈 slovo +\key{C-z} ikonizuj (peru邸) Emacs +\mkey{M-x revert-buffer} nahra text editovan辿ho souboru t鱈mt辿転 souborem z disku -\section{Nahrazovn} +\section{Nahrazov叩n鱈} -\key{M-\%} interaktivn hledej a nahrazuj -\key{M-C-\%} za pouit regulrnch vraz +\key{M-\%} interaktivn hledej a nahrazuj +\key{M-C-\%} za pou転it鱈 regul叩rn鱈ch v箪raz哲 \askip -Mon odpovdi v mdu hledn jsou +Mo転n辿 odpovdi v m坦du hled叩n鱈 jsou \askip -\key{SPC} nahra tento vskyt; b貍 na dal麹 -\key{,} nahra tento vskyt; necho dle -\key{DEL} tento vskyt nenahrazuj a b貍 dl -\key{!} nahra vechny dal麹 vskyty -\key{\^{}} zpt na pedchoz vskyt -\key{RET} ukoni query-replace -\key{C-r} zani rekurzivn editaci (\kbd{M-C-c} ji ukon蓁) - -\section{Regulrn vrazy} - -\key{. {\rm(teka)}} libovoln znak krom znaku novho dku -\key{*} 鍾dn nebo mnoho opakovn -\key{+} jedno nebo mnoho opakovn -\key{?} 鍾dn nebo jedno opakovn -\key{[$\ldots$]} oznauje tdu znak -\key{[\^{}$\ldots$]} neguje tdu znak - -\key{\\{\it c}} uvozen znaku, kter by ml jinak speciln vznam v -regulrnm vrazu - -\key{$\ldots$\\|$\ldots$\\|$\ldots$} vyhovuje jedn z alternativ (\uv{nebo}) -\key{\\( $\ldots$ \\)} seskupen nkolika vzork do jednoho -\key{\\{\it n}} tot蘊 jako {\it n\/}-t skupina - -\key{\^{}} vyhovuje na za葹tku dku -\key{\$} vyhovuje na konci dku - -\key{\\w} vyhovuje znaku, kter me bt sou葹st slova -\key{\\W} vyhovuje znaku, kter neme bt sou葹st slova -\key{\\<} vyhovuje na za葹tku slova +\key{SPC} nahra tento v箪skyt; b転 na dal邸鱈 +\key{,} nahra tento v箪skyt; necho d叩le +\key{DEL} tento v箪skyt nenahrazuj a b転 d叩l +\key{!} nahra v邸echny dal邸鱈 v箪skyty +\key{\^{}} zpt na pedchoz鱈 v箪skyt +\key{RET} ukoni query-replace +\key{C-r} zani rekurzivn鱈 editaci (\kbd{M-C-c} ji ukon鱈) + +\section{Regul叩rn鱈 v箪razy} + +\key{. {\rm(teka)}} libovoln箪 znak krom znaku nov辿ho 叩dku +\key{*} 転叩dn辿 nebo mnoho opakov叩n鱈 +\key{+} jedno nebo mnoho opakov叩n鱈 +\key{?} 転叩dn辿 nebo jedno opakov叩n鱈 +\key{[$\ldots$]} oznauje t鱈du znak哲 +\key{[\^{}$\ldots$]} neguje t鱈du znak哲 + +\key{\\{\it c}} uvozen鱈 znaku, kter箪 by ml jinak speci叩ln鱈 v箪znam v +regul叩rn鱈m v箪razu + +\key{$\ldots$\\|$\ldots$\\|$\ldots$} vyhovuje jedn辿 z alternativ (\uv{nebo}) +\key{\\( $\ldots$ \\)} seskupen鱈 nkolika vzork哲 do jednoho +\key{\\{\it n}} tot辿転 jako {\it n\/}-t叩 skupina + +\key{\^{}} vyhovuje na za叩tku 叩dku +\key{\$} vyhovuje na konci 叩dku + +\key{\\w} vyhovuje znaku, kter箪 m哲転e b箪t sou叩st鱈 slova +\key{\\W} vyhovuje znaku, kter箪 nem哲転e b箪t sou叩st鱈 slova +\key{\\<} vyhovuje na za叩tku slova \key{\\>} vyhovuje na konci slova -\key{\\b} vyhovuje mezislovnm mezerm -\key{\\B} vyhovuje mezerm, kter nejsou mezislovn +\key{\\b} vyhovuje mezislovn鱈m mezer叩m +\key{\\B} vyhovuje mezer叩m, kter辿 nejsou mezislovn鱈 \section{Registry} -\key{C-x r s} ulo region do registru -\key{C-x r i} vlo obsah registru do bufferu +\key{C-x r s} ulo転 region do registru +\key{C-x r i} vlo転 obsah registru do bufferu -\key{C-x r SPC} ulo aktuln pozici kurzoru do registru -\key{C-x r j} sko na pozici kurzoru uloenou v registru +\key{C-x r SPC} ulo転 aktu叩ln鱈 pozici kurzoru do registru +\key{C-x r j} sko na pozici kurzoru ulo転enou v registru -\section{Obdlnky} +\section{Obd辿ln鱈ky} -\key{C-x r r} zkopruj obdlnk do registru -\key{C-x r k} vyjmi obdlnk -\key{C-x r y} vlo obdlnk -\key{C-x r t} uvozen kadho dku etzcem +\key{C-x r r} zkop鱈ruj obd辿ln鱈k do registru +\key{C-x r k} vyjmi obd辿ln鱈k +\key{C-x r y} vlo転 obd辿ln鱈k +\key{C-x r t} uvozen鱈 ka転d辿ho 叩dku etzcem -\key{C-x r o} otevi obdlnk, posu text vpravo -\key{C-x r c} vyprzdni obdlnk +\key{C-x r o} otevi obd辿ln鱈k, posu text vpravo +\key{C-x r c} vypr叩zdni obd辿ln鱈k -\section{Pkazov interpret} +\section{P鱈kazov箪 interpret} -\key{M-x shell} spus pkazov interpret v Emacsu -\key{M-!} spus pkaz pkazovho interpretu -\key{M-|} spus pkaz pkazovho interpretu na region -\key{C-u M-|} filtruj region pes pkaz pkazovho interpretu +\key{M-x shell} spus泥 p鱈kazov箪 interpret v Emacsu +\key{M-!} spus泥 p鱈kaz p鱈kazov辿ho interpretu +\key{M-|} spus泥 p鱈kaz p鱈kazov辿ho interpretu na region +\key{C-u M-|} filtruj region pes p鱈kaz p鱈kazov辿ho interpretu \section{Kontrola pravopisu} \key{M-\$} zkontroluj pravopis slova pod kurzorem -\mkey{M-x ispell-region} zkontroluj pravopis vech slov v regionu +\mkey{M-x ispell-region} zkontroluj pravopis v邸ech slov v regionu \mkey{M-x ispell-buffer} zkontroluj pravopis v bufferu -\section{Mezinrodn znakov sady} +\section{Mezin叩rodn鱈 znakov辿 sady} -\key{C-x RET C-\\} zvol a aktivuj vstupn metodu pro aktuln buffer -\key{C-\\} aktivuj nebo deaktivuj vstupn metodu -\mkey{M-x list-input-methods} zobraz seznam vech vstupnch metod -\mkey{M-x set-language-environment} specifikuj hlavn jazyk +\key{C-x RET C-\\} zvol a aktivuj vstupn鱈 metodu pro aktu叩ln鱈 buffer +\key{C-\\} aktivuj nebo deaktivuj vstupn鱈 metodu +\mkey{M-x list-input-methods} zobraz seznam v邸ech vstupn鱈ch metod +\mkey{M-x set-language-environment} specifikuj hlavn鱈 jazyk -\key{C-x RET c} nastav kdovac systm pro nsledujc pkaz -\mkey{M-x find-file-literally} edituj soubor bez jakchkoli konverz +\key{C-x RET c} nastav k坦dovac鱈 syst辿m pro n叩sleduj鱈c鱈 p鱈kaz +\mkey{M-x find-file-literally} edituj soubor bez jak箪chkoli konverz鱈 -\mkey{M-x list-coding-systems} uka vechny kdovac systmy -\mkey{M-x prefer-coding-system} zvol preferovan kdovac systm +\mkey{M-x list-coding-systems} uka転 v邸echny k坦dovac鱈 syst辿my +\mkey{M-x prefer-coding-system} zvol preferovan箪 k坦dovac鱈 syst辿m -\section{Klvesov makra} +\section{Kl叩vesov叩 makra} -\key{C-x (} zani definici klvesovho makra -\key{C-x )} ukoni definici klvesovho makra -\key{C-x e} spus naposledy definovan klvesov makro -\key{C-u C-x (} pidej do posledn definovanho klvesovho makra -\mkey{M-x name-last-kbd-macro} pojmenuj naposledy definovan makro +\key{C-x (} zani definici kl叩vesov辿ho makra +\key{C-x )} ukoni definici kl叩vesov辿ho makra +\key{C-x e} spus泥 naposledy definovan辿 kl叩vesov辿 makro +\key{C-u C-x (} pidej do posledn definovan辿ho kl叩vesov辿ho makra +\mkey{M-x name-last-kbd-macro} pojmenuj naposledy definovan辿 makro -\section{Jednoduch nastaven} +\section{Jednoduch辿 nastaven鱈} -\key{M-x customize} jednoduch nastaven +\key{M-x customize} jednoduch辿 nastaven鱈 \section{Pomoc} -Emacs dopluje pkazy. Stisknete-li \kbd{M-x} {\it tab\/} nebo {\it -space\/} dostanete seznam pkaz Emacsu. +Emacs dopluje p鱈kazy. Stisknete-li \kbd{M-x} {\it tab\/} nebo {\it +space\/} dostanete seznam p鱈kaz哲 Emacsu. \askip -\key{C-h} npovda Emacsu -\key{C-h t} spust tutoril Emacsu -\key{C-h i} spust Info, prohl躱e dokumentace -\key{C-h a} uk畩e pkazy vyhovujc zadanmu etzci (apropos) -\key{C-h k} zobraz dokumentaci funkce sputn pomoc zadan klvesy +\key{C-h} n叩povda Emacsu +\key{C-h t} spust鱈 tutori叩l Emacsu +\key{C-h i} spust鱈 Info, prohl鱈転e dokumentace +\key{C-h a} uk叩転e p鱈kazy vyhovuj鱈c鱈 zadan辿mu etzci (apropos) +\key{C-h k} zobraz鱈 dokumentaci funkce spu邸tn辿 pomoc鱈 zadan辿 kl叩vesy \askip -Emacs pracuje v rznch {\it mdech}, kter upravuj chovn -Emacsu pro editovan text danho typu. Mode line obsahuje jmna aktulnch -md v zvorkch. +Emacs pracuje v r哲zn箪ch {\it m坦dech}, kter辿 upravuj鱈 chov叩n鱈 +Emacsu pro editovan箪 text dan辿ho typu. Mode line obsahuje jm辿na aktu叩ln鱈ch +m坦d哲 v z叩vork叩ch. \askip -\key{C-h m} zobraz dokumentaci aktulnch md. +\key{C-h m} zobraz dokumentaci aktu叩ln鱈ch m坦d哲. \copyrightnotice @@ -417,5 +412,4 @@ m % Local variables: % compile-command: "csplain survival" -% coding: iso-latin-2 % End: diff --git a/etc/refcards/sk-dired-ref.tex b/etc/refcards/sk-dired-ref.tex index 5304726..c350cb6 100644 --- a/etc/refcards/sk-dired-ref.tex +++ b/etc/refcards/sk-dired-ref.tex @@ -3,7 +3,7 @@ % Copyright (C) 2000-2014 Free Software Foundation, Inc. % Author: Evgeny Roubinchtein -% Czech translation: Pavel Jank , March 2001 +% Czech translation: Pavel Jan鱈k , March 2001 % Slovak translation: Miroslav Vasko , March 2001 % This file is part of GNU Emacs. @@ -32,11 +32,6 @@ % Slovak hyphenation rules applied \shyph -% Without this, pdfTeX 3.1415926-2.5-1.40.14 (TeX Live 2013/Debian) -% aborts with: "! UTF-8 INPUT IS CORRUPTED ! -% May be you are using another input encoding" -\input utf8off - % This file can be printed with 1, 2, or 3 columns per page. % Specify how many you want here. \newcount\columnsperpage @@ -61,7 +56,7 @@ \centerline{For GNU Emacs version \versionemacs} \centerline{Originally written May 2000 by Evgeny Roubinchtein,} \centerline{using refcard layout designed by Stephen Gildea.} -\centerline{Translated by Miroslav Vako.} +\centerline{Translated by Miroslav Va邸ko.} Permission is granted to make and distribute copies of this card provided the copyright notice and this permission notice @@ -255,10 +250,10 @@ For copies of the GNU Emacs manual, see: %**end of header -\title{Referenn karta pre Dired} +\title{Referenn叩 karta pre Dired} -\centerline{(uren pre Dired v GNU Emacse \versionemacs)} -\centerline{Prkazy oznaen \dx{} vyaduj dired-x} +\centerline{(uren辿 pre Dired v GNU Emacse \versionemacs)} +\centerline{Pr鱈kazy oznaen辿 \dx{} vy転aduj炭 dired-x} % trim this down to fit everything on one page % \section{General} @@ -287,120 +282,120 @@ For copies of the GNU Emacs manual, see: % When editing several directories in one buffer, each directory acts as a % page, so C-x [ and C-x ] can be used to move between directories. -\section{Spustenie a ukonenie Dired} +\section{Spustenie a ukonenie Dired} \key{spustenie dired}{C-x d} -\key{spustenie dired v adresri s aktulnym sborom}{C-x C-j \dx} -\key{ukonenie dired}{q} - -\section{Prkazy pre presuny} - -\key{sp篁 na predchdzajci riadok}{p} -\key{vpred na nasledujci riadok}{n} -\key{hore na predchdzajci adresr}{<} -\key{dole na nasledujci adresr}{>} -\key{na al麹 oznaen sbor}{M-\}} -\key{na predchdzajci oznaen sbor}{M-\{} -\key{sp篁 na predchdzajci podadresr}{M-C-p} -\key{vpred na al麹 podadresr}{M-C-n} -\key{na nadraden adresr}{^} -\key{cho na prv podadresr}{M-C-d} - -\section{Prkazy pomocou myi} -\metax{otvor sbor}{Mouse_Button_2} +\key{spustenie dired v adres叩ri s aktu叩lnym s炭borom}{C-x C-j \dx} +\key{ukonenie dired}{q} + +\section{Pr鱈kazy pre presuny} + +\key{sp辰泥 na predch叩dzaj炭ci riadok}{p} +\key{vpred na nasleduj炭ci riadok}{n} +\key{hore na predch叩dzaj炭ci adres叩r}{<} +\key{dole na nasleduj炭ci adres叩r}{>} +\key{na al邸鱈 oznaen箪 s炭bor}{M-\}} +\key{na predch叩dzaj炭ci oznaen箪 s炭bor}{M-\{} +\key{sp辰泥 na predch叩dzaj炭ci podadres叩r}{M-C-p} +\key{vpred na al邸鱈 podadres叩r}{M-C-n} +\key{na nadraden箪 adres叩r}{^} +\key{cho na prv箪 podadres叩r}{M-C-d} + +\section{Pr鱈kazy pomocou my邸i} +\metax{otvor s炭bor}{Mouse_Button_2} \metax{zobraz menu}{Control-Mouse_Button_3} -\section{Okamit akcie nad sbormi} - -\key{otvor aktulny sbor}{f} -\key{otvor aktulny sbor iba pre 蓁tanie}{v} -\key{otvor aktulny sbor v inom okne}{o} -%%\key{otvor aktulny sbor v inom rmci}{w} -%%\key{zobraz aktulny sbor}{C-u o} -\key{vytvor nov podadresr}{+} -\key{porovnaj sbor pod kurzorom s oznaenm}{=} - -\section{Oznaovanie a odznaovanie sborov} - -\key{ozna sbor alebo podadresr pre alie prkazy}{m} -\key{odzna sbor alebo sbory podadresre}{u} -\key{zru oznaenie vetkch sborov v bufferi}{M-delete} -\key{ozna sbory so zadanou prponou}{* .} -\key{ozna vetky adresre}{* /} -\key{ozna vetky symbolick odkazy}{* @} -\key{ozna vetky spustiten sbory}{* *} -\key{invertuj oznaenie}{* t} -\key{ozna vetky sbory v aktulnom podadresri}{* s} -\key{ozna sbory vyhovujce regulrnemu vrazu}{* \%} -\key{zme znaku na in psmeno}{* c} -\key{ozna sbory, pre ktor elispov vraz vrac t}{* ( \dx} - -\section{Modifikcia Dired bufferu} - -\key{vlo do tohto bufferu podadresr}{i} -\key{odstr癇 oznaen sbory z bufferu}{k} -\key{odstr癇 z bufferu vpis podadresra}{C-u k} -\key{znovu na蓁taj adresr (znaky sa zachovaj)}{g} -\key{prepni triedenie adresra poda mena/dtumu}{s} -\key{uprav voby prkazu ls}{C-u s} -\key{obnov znaky, skryt riadky a~pod.}{C-_} -\key{skry vetky podadresre}{M-\$} -\key{skry alebo odkry vetky podadresre}{\$} - -\section{Prkazy nad oznaenmi sbormi} - -\key{kopruj sbor(y)}{C} -\key{premenuj sbor alebo presu sbory}{R} -\key{zme vlastnka sboru(ov)}{O} -\key{zme skupinu sboru(ov)}{G} -\key{zme prstupov prva sboru(ov)}{M} -\key{vytla sbor(y)}{P} -\key{zme nzov sboru(ov) na mal psmen}{\% l} -\key{zme nzov sboru(ov) na vek psmen}{\% u} -\key{zma oznaen sbory}{D} -%%\key{vykonaj uuencode alebo uudecode sboru(ov)}{U} -\key{skomprimuj alebo dekomprimuj sbor(y)}{Z} -\key{spusti info na sbore}{I \dx} -\key{vytvor symbolick() odkaz(y)}{S} -\key{vytvor relatvne symbolick odkazy}{Y} -\key{vytvor pevn odkaz}{H} -\key{prehadaj sbory -- hadaj regulrny vraz}{A} -\key{nahra regulrne vrazy}{Q} -\key{prelo sbory (byte-compile)}{B} -\key{na蓁taj sbory (load-file)}{L} -\key{spusti prkaz nad sborom(mi)}{!} - -\section{Oznaenie sborov pre zmazanie} - -\leftline{\bf Odznaujce prkazy ma醸 znaku pre zmazanie} -\key{ozna sbor pre zmazanie}{d} -%%\key{odstr癇 znaku pre zmazanie}{delete} -\key{ozna vetky zlohy (sbory koniace na \~{})}{\~{}} -\key{ozna vetky zlohy (auto-save)}{\#} -\key{ozna rzne doasn sbory}{\% \&} -\key{ozna 蓁slovan zlohy (koniace na .\~{}1\~{} a~pod.)}{.} -\key{vyma sbory oznaen na zmazanie}{x} -\key{ozna sbory vyhovujce regulrnemu vrazu}{\% d} - -\section{Prkazy s regulrnymi vrazmi} - -\key{ozna sbory vyhovujce regulrnemu vrazu}{\% m} -\key{skopruj oznaen sbory obsahujce regexp}{\% C} -\key{premenuj oznaen sbory vyhovujce regexp}{\% R} -\key{pevn odkaz}{\% H} -\key{symbolick odkaz}{\% S} -\key{symbolick odkaz s relatvnou cestou}{\% Y} -\key{ozna pre zmazanie}{\% d} +\section{Okam転it辿 akcie nad s炭bormi} + +\key{otvor aktu叩lny s炭bor}{f} +\key{otvor aktu叩lny s炭bor iba pre 鱈tanie}{v} +\key{otvor aktu叩lny s炭bor v inom okne}{o} +%%\key{otvor aktu叩lny s炭bor v inom r叩mci}{w} +%%\key{zobraz aktu叩lny s炭bor}{C-u o} +\key{vytvor nov箪 podadres叩r}{+} +\key{porovnaj s炭bor pod kurzorom s oznaen箪m}{=} + +\section{Oznaovanie a odznaovanie s炭borov} + +\key{ozna s炭bor alebo podadres叩r pre al邸ie pr鱈kazy}{m} +\key{odzna s炭bor alebo s炭bory podadres叩re}{u} +\key{zru邸 oznaenie v邸etk箪ch s炭borov v bufferi}{M-delete} +\key{ozna s炭bory so zadanou pr鱈ponou}{* .} +\key{ozna v邸etky adres叩re}{* /} +\key{ozna v邸etky symbolick辿 odkazy}{* @} +\key{ozna v邸etky spustite直n辿 s炭bory}{* *} +\key{invertuj oznaenie}{* t} +\key{ozna v邸etky s炭bory v aktu叩lnom podadres叩ri}{* s} +\key{ozna s炭bory vyhovuj鱈ce regul叩rnemu v箪razu}{* \%} +\key{zme znaku na in辿 p鱈smeno}{* c} +\key{ozna s炭bory, pre ktor辿 elispov箪 v箪raz vrac鱈 t}{* ( \dx} + +\section{Modifik叩cia Dired bufferu} + +\key{vlo転 do tohto bufferu podadres叩r}{i} +\key{odstr叩 oznaen辿 s炭bory z bufferu}{k} +\key{odstr叩 z bufferu v箪pis podadres叩ra}{C-u k} +\key{znovu na鱈taj adres叩r (znaky sa zachovaj炭)}{g} +\key{prepni triedenie adres叩ra pod直a mena/d叩tumu}{s} +\key{uprav vo直by pr鱈kazu ls}{C-u s} +\key{obnov znaky, skryt辿 riadky a~pod.}{C-_} +\key{skry v邸etky podadres叩re}{M-\$} +\key{skry alebo odkry v邸etky podadres叩re}{\$} + +\section{Pr鱈kazy nad oznaen箪mi s炭bormi} + +\key{kop鱈ruj s炭bor(y)}{C} +\key{premenuj s炭bor alebo presu s炭bory}{R} +\key{zme vlastn鱈ka s炭boru(ov)}{O} +\key{zme skupinu s炭boru(ov)}{G} +\key{zme pr鱈stupov辿 pr叩va s炭boru(ov)}{M} +\key{vytla s炭bor(y)}{P} +\key{zme n叩zov s炭boru(ov) na mal辿 p鱈smen叩}{\% l} +\key{zme n叩zov s炭boru(ov) na ve直k辿 p鱈smen叩}{\% u} +\key{zma転 oznaen辿 s炭bory}{D} +%%\key{vykonaj uuencode alebo uudecode s炭boru(ov)}{U} +\key{skomprimuj alebo dekomprimuj s炭bor(y)}{Z} +\key{spusti info na s炭bore}{I \dx} +\key{vytvor symbolick箪(辿) odkaz(y)}{S} +\key{vytvor relat鱈vne symbolick辿 odkazy}{Y} +\key{vytvor pevn箪 odkaz}{H} +\key{preh直adaj s炭bory -- h直adaj regul叩rny v箪raz}{A} +\key{nahra regul叩rne v箪razy}{Q} +\key{prelo転 s炭bory (byte-compile)}{B} +\key{na鱈taj s炭bory (load-file)}{L} +\key{spusti pr鱈kaz nad s炭borom(mi)}{!} + +\section{Oznaenie s炭borov pre zmazanie} + +\leftline{\bf Odznauj炭ce pr鱈kazy ma転炭 znaku pre zmazanie} +\key{ozna s炭bor pre zmazanie}{d} +%%\key{odstr叩 znaku pre zmazanie}{delete} +\key{ozna v邸etky z叩lohy (s炭bory koniace na \~{})}{\~{}} +\key{ozna v邸etky z叩lohy (auto-save)}{\#} +\key{ozna r担zne doasn辿 s炭bory}{\% \&} +\key{ozna 鱈slovan辿 z叩lohy (koniace na .\~{}1\~{} a~pod.)}{.} +\key{vyma転 s炭bory oznaen辿 na zmazanie}{x} +\key{ozna s炭bory vyhovuj炭ce regul叩rnemu v箪razu}{\% d} + +\section{Pr鱈kazy s regul叩rnymi v箪razmi} + +\key{ozna s炭bory vyhovuj炭ce regul叩rnemu v箪razu}{\% m} +\key{skop鱈ruj oznaen辿 s炭bory obsahuj炭ce regexp}{\% C} +\key{premenuj oznaen辿 s炭bory vyhovuj炭ce regexp}{\% R} +\key{pevn箪 odkaz}{\% H} +\key{symbolick箪 odkaz}{\% S} +\key{symbolick箪 odkaz s relat鱈vnou cestou}{\% Y} +\key{ozna pre zmazanie}{\% d} \section{Dired a Find} -\metax{otvor v dired sbory vyhovujce vzorke}{M-x find-name-dired} -\metax{otvor v dired sbory obsahujce vzorku}{M-x find-grep-dired} -\metax{otvor v dired sbory poda vstupu \kbd{find}}{M-x find-dired} +\metax{otvor v dired s炭bory vyhovuj炭ce vzorke}{M-x find-name-dired} +\metax{otvor v dired s炭bory obsahuj炭ce vzorku}{M-x find-grep-dired} +\metax{otvor v dired s炭bory pod直a v箪stupu \kbd{find}}{M-x find-dired} -\section{Npoveda} +\section{N叩poveda} -\key{zobraz npovedu}{h} -\key{prehad prkazov dired}{?} +\key{zobraz n叩povedu}{h} +\key{preh直ad pr鱈kazov dired}{?} \copyrightnotice @@ -408,5 +403,4 @@ For copies of the GNU Emacs manual, see: % Local variables: % compile-command: "csplain sk-dired-ref" -% coding: iso-latin-2 % End: diff --git a/etc/refcards/sk-refcard.tex b/etc/refcards/sk-refcard.tex index 9a11299..07cccca 100644 --- a/etc/refcards/sk-refcard.tex +++ b/etc/refcards/sk-refcard.tex @@ -6,8 +6,8 @@ % Author: Stephen Gildea % Czech translation: Jan Buchal , January 1999 % Milan Zamazal , August 1999 -% Pavel Jank , November 2000 (Emacs 21) -% Slozak translation: Miroslav Vako , March 2001 +% Pavel Jan鱈k , November 2000 (Emacs 21) +% Slozak translation: Miroslav Va邸ko , March 2001 % This file is part of GNU Emacs. @@ -50,11 +50,6 @@ % Slovak hyphenation rules applied \shyph -% Without this, pdfTeX 3.1415926-2.5-1.40.14 (TeX Live 2013/Debian) -% aborts with: "! UTF-8 INPUT IS CORRUPTED ! -% May be you are using another input encoding" -\input utf8off - % This file can be printed with 1, 2, or 3 columns per page. % Specify how many you want here. \newcount\columnsperpage @@ -78,7 +73,7 @@ \centerline{Copyright \copyright\ \year\ Free Software Foundation, Inc.} \centerline{For GNU Emacs version \versionemacs} \centerline{Designed by Stephen Gildea} -\centerline{Translated by Miroslav Vako} +\centerline{Translated by Miroslav Va邸ko} Permission is granted to make and distribute copies of this card provided the copyright notice and this permission notice @@ -265,67 +260,67 @@ For copies of the GNU Emacs manual, see: %**end of header -\title{GNU Emacs -- Referenn karta} +\title{GNU Emacs -- Referenn叩 karta} \centerline{(pre verziu \versionemacs)} \section{Spustenie Emacsu} -Pre spustenie GNU~Emacsu~\versionemacs{} nap躪te jeho meno: \kbd{emacs} +Pre spustenie GNU~Emacsu~\versionemacs{} nap鱈邸te jeho meno: \kbd{emacs} -Ako na蓁ta a editova sbory sa dozviete ni捷ie v~oddiele Sbory. +Ako na鱈ta泥 a editova泥 s炭bory sa dozviete ni転邸ie v~oddiele S炭bory. -\section{Ukonenie Emacsu} +\section{Ukonenie Emacsu} -\key{pozastavenie (zmenenie do ikony v~X11)}{C-z} -\key{definitvny odchod z~Emacsu}{C-x C-c} +\key{pozastavenie (zmen邸enie do ikony v~X11)}{C-z} +\key{definit鱈vny odchod z~Emacsu}{C-x C-c} -\section{Sbory} +\section{S炭bory} -\key{{\bf na蓁ta} sbor do Emacsu}{C-x C-f} -\key{{\bf uloi} sbor sp篁 na disk}{C-x C-s} -\key{uloi {\bf vetky} sbory}{C-x s} -\key{{\bf vloi} obsah inho sboru do bufferu}{C-x i} -\key{zameni tento sbor inm sborom}{C-x C-v} -\key{zapsa buffer do zadanho sboru}{C-x C-w} -\key{vloi do systmu sprvy verzi}{C-x C-q} +\key{{\bf na鱈ta泥} s炭bor do Emacsu}{C-x C-f} +\key{{\bf ulo転i泥} s炭bor sp辰泥 na disk}{C-x C-s} +\key{ulo転i泥 {\bf v邸etky} s炭bory}{C-x s} +\key{{\bf vlo転i泥} obsah in辿ho s炭boru do bufferu}{C-x i} +\key{zameni泥 tento s炭bor in箪m s炭borom}{C-x C-v} +\key{zap鱈sa泥 buffer do zadan辿ho s炭boru}{C-x C-w} +\key{vlo転i泥 do syst辿mu spr叩vy verzi鱈}{C-x C-q} -\section{Pou壌vanie npovedy} +\section{Pou転鱈vanie n叩povedy} -Systm npovedy je jednoduch. Stlate \kbd{C-h} (alebo \kbd{F1}) a sledujte -intrukcie. vodn {\bf ttorial} je mon spusti pomocou \kbd{C-h t}. +Syst辿m n叩povedy je jednoduch箪. Stlate \kbd{C-h} (alebo \kbd{F1}) a sledujte +in邸trukcie. vodn箪 {\bf t炭torial} je mo転n辿 spusti泥 pomocou \kbd{C-h t}. -\key{odstrni okno s~npovedou}{C-x 1} -\key{rolova okno s~npovedou}{C-M-v} +\key{odstr叩ni泥 okno s~n叩povedou}{C-x 1} +\key{rolova泥 okno s~n叩povedou}{C-M-v} -\key{apropos: prkazy zodpovedajce reazcu}{C-h a} -\key{zobrazi funkciu danej klvesy}{C-h c} -\key{zobrazi popis funkcie}{C-h f} -\key{zobrazi informcie o~aktulnych mdoch}{C-h m} +\key{apropos: pr鱈kazy zodpovedaj炭ce re泥azcu}{C-h a} +\key{zobrazi泥 funkciu danej kl叩vesy}{C-h c} +\key{zobrazi泥 popis funkcie}{C-h f} +\key{zobrazi泥 inform叩cie o~aktu叩lnych m坦doch}{C-h m} -\section{Opravy chb} +\section{Opravy ch箪b} -\key{{\bf prerui} vkladan alebo vykonvan prkaz}{C-g} -\metax{{\bf obnovi} sbor straten pdom systmu}{M-x recover-file} -\key{{\bf zrui} nechcen zmenu}{C-x u {\it n.} C-_} -\metax{vrti pvodn obsah bufferu}{M-x revert-buffer} -\key{prekresli \uv{rozpadnut} obrazovku}{C-l} +\key{{\bf preru邸i泥} vkladan箪 alebo vykon叩van箪 pr鱈kaz}{C-g} +\metax{{\bf obnovi泥} s炭bor straten箪 p叩dom syst辿mu}{M-x recover-file} +\key{{\bf zru邸i泥} nechcen炭 zmenu}{C-x u {\it n.} C-_} +\metax{vr叩ti泥 p担vodn箪 obsah bufferu}{M-x revert-buffer} +\key{prekresli泥 \uv{rozpadnut炭} obrazovku}{C-l} -\section{Inkrementlne vyhadvanie} +\section{Inkrement叩lne vyh直ad叩vanie} -\key{vyhada vpred}{C-s} -\key{vyhada vzad}{C-r} -\key{vyhada regulrny vraz}{C-M-s} -\key{vyhada regulrny vraz dozadu}{C-M-r} -\key{predchdzajci vyhadvan reazec}{M-p} -\key{nasledujc nov麹 vyhadvan reazec}{M-n} -\key{ukoni inkrementlne vyhadvanie}{RET} -\key{zrui efekt poslednho zadanho znaku}{DEL} -\key{prerui prebiehajce vyhadvanie}{C-g} +\key{vyh直ada泥 vpred}{C-s} +\key{vyh直ada泥 vzad}{C-r} +\key{vyh直ada泥 regul叩rny v箪raz}{C-M-s} +\key{vyh直ada泥 regul叩rny v箪raz dozadu}{C-M-r} +\key{predch叩dzaj炭ci vyh直ad叩van箪 re泥azec}{M-p} +\key{nasleduj炭c鱈 nov邸鱈 vyh直ad叩van箪 re泥azec}{M-n} +\key{ukoni泥 inkrement叩lne vyh直ad叩vanie}{RET} +\key{zru邸i泥 efekt posledn辿ho zadan辿ho znaku}{DEL} +\key{preru邸i泥 prebiehaj炭ce vyh直ad叩vanie}{C-g} -alie \kbd{C-s} alebo \kbd{C-r} zopakuje vyhadvanie v~danom smere. Ak -Emacs vyhadva, \kbd{C-g} zru麹 iba nenjden as reazca. +al邸ie \kbd{C-s} alebo \kbd{C-r} zopakuje vyh直ad叩vanie v~danom smere. Ak +Emacs vyh直ad叩va, \kbd{C-g} zru邸鱈 iba nen叩jden炭 as泥 re泥azca. \shortcopyrightnotice @@ -337,307 +332,307 @@ Emacs vyh \threecol{znak}{C-b}{C-f} \threecol{slovo}{M-b}{M-f} \threecol{riadok}{C-p}{C-n} -\threecol{na zaiatok alebo koniec riadku}{C-a}{C-e} +\threecol{na zaiatok alebo koniec riadku}{C-a}{C-e} \threecol{vetu}{M-a}{M-e} \threecol{odstavec}{M-\{}{M-\}} -\threecol{strnku}{C-x [}{C-x ]} -\threecol{symbolick vraz}{C-M-b}{C-M-f} +\threecol{str叩nku}{C-x [}{C-x ]} +\threecol{symbolick箪 v箪raz}{C-M-b}{C-M-f} \threecol{funkciu}{C-M-a}{C-M-e} -\threecol{na zaiatok alebo koniec bufferu}{M-<}{M->} +\threecol{na zaiatok alebo koniec bufferu}{M-<}{M->} } -\key{rolova na aliu obrazovku}{C-v} -\key{rolova na predchdzajcu obrazovku}{M-v} -\key{rolova vavo}{C-x <} -\key{rolova vpravo}{C-x >} -\key{aktulny riadok do stredu obrazovky}{C-u C-l} +\key{rolova泥 na al邸iu obrazovku}{C-v} +\key{rolova泥 na predch叩dzaj炭cu obrazovku}{M-v} +\key{rolova泥 v直avo}{C-x <} +\key{rolova泥 vpravo}{C-x >} +\key{aktu叩lny riadok do stredu obrazovky}{C-u C-l} -\section{Ruenie a mazanie} +\section{Ru邸enie a mazanie} \paralign to \hsize{#\tabskip=10pt plus 1 fil&#\tabskip=0pt&#\cr -\threecol{{\bf ruen objekt }}{{\bf vzad}}{{\bf vpred}} -\threecol{znak (mazanie, nie ruenie)}{DEL}{C-d} +\threecol{{\bf ru邸en箪 objekt }}{{\bf vzad}}{{\bf vpred}} +\threecol{znak (mazanie, nie ru邸enie)}{DEL}{C-d} \threecol{slovo}{M-DEL}{M-d} \threecol{riadok (do konca)}{M-0 C-k}{C-k} \threecol{veta}{C-x DEL}{M-k} -\threecol{symbolick vraz}{M-- C-M-k}{C-M-k} +\threecol{symbolick箪 v箪raz}{M-- C-M-k}{C-M-k} } -\key{zrui {\bf oblas}}{C-w} -\key{skoprova oblas do schrnky}{M-w} -\key{zrui a po najbli捷 vskyt znaku {\it znak}}{M-z {\it znak}} +\key{zru邸i泥 {\bf oblas泥}}{C-w} +\key{skop鱈rova泥 oblas泥 do schr叩nky}{M-w} +\key{zru邸i泥 a転 po najbli転邸鱈 v箪skyt znaku {\it znak}}{M-z {\it znak}} -\key{vhodi naposledy zruen objekt}{C-y} -\key{nahradi vhoden objekt predchdzajcim zruenm}{M-y} +\key{vhodi泥 naposledy zru邸en箪 objekt}{C-y} +\key{nahradi泥 vhoden箪 objekt predch叩dzaj炭cim zru邸en箪m}{M-y} -\section{Oznaovanie} +\section{Oznaovanie} -\key{vloi znaku}{C-@ {\it n.} C-SPC} -\key{prehodi kurzor a znaku}{C-x C-x} +\key{vlo転i泥 znaku}{C-@ {\it n.} C-SPC} +\key{prehodi泥 kurzor a znaku}{C-x C-x} -\key{oznai zadan poet {\bf slov}}{M-@} -\key{oznai {\bf odstavec}}{M-h} -\key{oznai {\bf strnku}}{C-x C-p} -\key{oznai {\bf symbolick vraz}}{C-M-@} -\key{oznai {\bf funkciu}}{C-M-h} -\key{oznai cel {\bf buffer}}{C-x h} +\key{oznai泥 zadan箪 poet {\bf slov}}{M-@} +\key{oznai泥 {\bf odstavec}}{M-h} +\key{oznai泥 {\bf str叩nku}}{C-x C-p} +\key{oznai泥 {\bf symbolick箪 v箪raz}}{C-M-@} +\key{oznai泥 {\bf funkciu}}{C-M-h} +\key{oznai泥 cel箪 {\bf buffer}}{C-x h} -\section{Interaktvne nahradzovanie} +\section{Interakt鱈vne nahradzovanie} -\key{interaktvne nahradi textov reazec}{M-\%} -\metax{s~pouitm regulrneho vrazu}{M-x query-replace-regexp} +\key{interakt鱈vne nahradi泥 textov箪 re泥azec}{M-\%} +\metax{s~pou転it鱈m regul叩rneho v箪razu}{M-x query-replace-regexp} -Platn odpovede v~mde query-replace s +Platn辿 odpovede v~m坦de query-replace s炭 -\key{{\bf nahradi} a s na alie}{SPC} -\key{nahradi a zosta na mieste}{,} -\key{{\bf skoi} na alie bez nahradenia}{DEL} -\key{zameni vetky zostvajce vskyty}{!} -\key{{\bf sp篁} na predchdzajci vskyt reazca}{^} +\key{{\bf nahradi泥} a 鱈s泥 na al邸ie}{SPC} +\key{nahradi泥 a zosta泥 na mieste}{,} +\key{{\bf skoi泥} na al邸ie bez nahradenia}{DEL} +\key{zameni泥 v邸etky zost叩vaj炭ce v箪skyty}{!} +\key{{\bf sp辰泥} na predch叩dzaj炭ci v箪skyt re泥azca}{^} \key{{\bf koniec} nahradzovania}{RET} -\key{rekurzvne editovanie (ukon蓁 sa \kbd{C-M-c})}{C-r} +\key{rekurz鱈vne editovanie (ukon鱈 sa \kbd{C-M-c})}{C-r} -\section{Okn} +\section{Okn叩} -Ak s zobrazen dva prkazy, potom ten druh plat pre Xov okno. +Ak s炭 zobrazen辿 dva pr鱈kazy, potom ten druh箪 plat鱈 pre Xov辿 okno. -\key{zrui vetky ostatn okn}{C-x 1} +\key{zru邸i泥 v邸etky ostatn辿 okn叩}{C-x 1} {\setbox0=\hbox{\kbd{0}}\advance\hsize by 0\wd0 \paralign to \hsize{#\tabskip=10pt plus 1 fil&#\tabskip=0pt&#\cr -\threecol{rozdeli okno na horn a doln}{C-x 2\ \ \ \ }{C-x 5 2} -\threecol{zrui toto okno}{C-x 0\ \ \ \ }{C-x 5 0} +\threecol{rozdeli泥 okno na horn辿 a doln辿}{C-x 2\ \ \ \ }{C-x 5 2} +\threecol{zru邸i泥 toto okno}{C-x 0\ \ \ \ }{C-x 5 0} }} -\key{rozdeli okno na av a prav}{C-x 3} +\key{rozdeli泥 okno na 直av辿 a prav辿}{C-x 3} -\key{rolova in okno}{C-M-v} +\key{rolova泥 in辿 okno}{C-M-v} {\setbox0=\hbox{\kbd{0}}\advance\hsize by 2\wd0 \paralign to \hsize{#\tabskip=10pt plus 1 fil&#\tabskip=0pt&#\cr -\threecol{prepn kurzor do inho okna}{C-x o}{C-x 5 o} - -\threecol{vybra buffer v~inom okne}{C-x 4 b}{C-x 5 b} -\threecol{zobrazi buffer v~inom okne}{C-x 4 C-o}{C-x 5 C-o} -\threecol{otvori sbor v~inom okne}{C-x 4 f}{C-x 5 f} -\threecol{otvori sbor iba pre 蓁tanie v~inom okne}{C-x 4 r}{C-x 5 r} -\threecol{spusti Dired v~inom okne}{C-x 4 d}{C-x 5 d} -\threecol{njs tag v~inom okne}{C-x 4 .}{C-x 5 .} +\threecol{prepn炭泥 kurzor do in辿ho okna}{C-x o}{C-x 5 o} + +\threecol{vybra泥 buffer v~inom okne}{C-x 4 b}{C-x 5 b} +\threecol{zobrazi泥 buffer v~inom okne}{C-x 4 C-o}{C-x 5 C-o} +\threecol{otvori泥 s炭bor v~inom okne}{C-x 4 f}{C-x 5 f} +\threecol{otvori泥 s炭bor iba pre 鱈tanie v~inom okne}{C-x 4 r}{C-x 5 r} +\threecol{spusti泥 Dired v~inom okne}{C-x 4 d}{C-x 5 d} +\threecol{n叩js泥 tag v~inom okne}{C-x 4 .}{C-x 5 .} }} -\key{zv粫i okno}{C-x ^} -\key{zi okno}{C-x \{} -\key{roz麹ri okno}{C-x \}} +\key{zv辰邸i泥 okno}{C-x ^} +\key{z炭転i泥 okno}{C-x \{} +\key{roz邸鱈ri泥 okno}{C-x \}} -\section{Formtovanie} +\section{Form叩tovanie} -\key{odsadi aktulny {\bf riadok} (poda mdu)}{TAB} -\key{odsadi {\bf oblas} (poda mdu)}{C-M-\\} -\key{odsadi {\bf symbolick vraz} (poda mdu)}{C-M-q} -\key{odsadi oblas napevno o~{\it argument\/} stpcov}{C-x TAB} +\key{odsadi泥 aktu叩lny {\bf riadok} (pod直a m坦du)}{TAB} +\key{odsadi泥 {\bf oblas泥} (pod直a m坦du)}{C-M-\\} +\key{odsadi泥 {\bf symbolick箪 v箪raz} (pod直a m坦du)}{C-M-q} +\key{odsadi泥 oblas泥 napevno o~{\it argument\/} st頂pcov}{C-x TAB} -\key{vloi znak novho riadku za kurzor}{C-o} -\key{posun zbytok riadku zvisle dole}{C-M-o} -\key{zmaza przdne riadky okolo kurzoru}{C-x C-o} -\key{spoji riadok s~predchdzajcim (s~arg.~s~nasl.)}{M-^} -\key{zmaza przdne miesto okolo kurzoru}{M-\\} -\key{necha presne jednu medzeru okolo kurzoru}{M-SPC} +\key{vlo転i泥 znak nov辿ho riadku za kurzor}{C-o} +\key{posun炭泥 zbytok riadku zvisle dole}{C-M-o} +\key{zmaza泥 pr叩zdne riadky okolo kurzoru}{C-x C-o} +\key{spoji泥 riadok s~predch叩dzaj炭cim (s~arg.~s~nasl.)}{M-^} +\key{zmaza泥 pr叩zdne miesto okolo kurzoru}{M-\\} +\key{necha泥 presne jednu medzeru okolo kurzoru}{M-SPC} -\key{zalomi odstavec}{M-q} -\key{nastavi stpec pre zalamovanie}{C-x f} -\key{nastavi prefix, ktorm za蓁naj riadky}{C-x .} -\key{nastavi font}{M-g} +\key{zalomi泥 odstavec}{M-q} +\key{nastavi泥 st頂pec pre zalamovanie}{C-x f} +\key{nastavi泥 prefix, ktor箪m za鱈naj炭 riadky}{C-x .} +\key{nastavi泥 font}{M-g} -\section{Zmena vekosti psmen} +\section{Zmena ve直kosti p鱈smen} -\key{zmeni psmen slova na vek}{M-u} -\key{zmeni psmen slova na mal}{M-l} -\key{zmeni zaiaton psmeno slova na vek}{M-c} +\key{zmeni泥 p鱈smen叩 slova na ve直k辿}{M-u} +\key{zmeni泥 p鱈smen叩 slova na mal辿}{M-l} +\key{zmeni泥 zaiaton辿 p鱈smeno slova na ve直k辿}{M-c} -\key{zmeni psmen oblasti na vek}{C-x C-u} -\key{zmeni psmen oblasti na mal}{C-x C-l} +\key{zmeni泥 p鱈smen叩 oblasti na ve直k辿}{C-x C-u} +\key{zmeni泥 p鱈smen叩 oblasti na mal辿}{C-x C-l} \section{Minibuffer} -Nasledujce klvesy s platn pre minibuffer. +Nasleduj炭ce kl叩vesy s炭 platn辿 pre minibuffer. -\key{doplni z~ponuky}{TAB} -\key{doplni do najbli捷ieho slova}{SPC} -\key{doplni a vykona}{RET} -\key{zobrazi mon doplnenia}{?} -\key{predchdzajci prkaz z~minibufferu}{M-p} -\key{nov麹 alebo implicitn prkaz z~minibufferu}{M-n} -\key{vyhada regulrny vraz v~histrii vzad}{M-r} -\key{vyhada regulrny vraz v~histrii vpred}{M-s} -\key{zrui prkaz}{C-g} +\key{doplni泥 z~ponuky}{TAB} +\key{doplni泥 do najbli転邸ieho slova}{SPC} +\key{doplni泥 a vykona泥}{RET} +\key{zobrazi泥 mo転n辿 doplnenia}{?} +\key{predch叩dzaj炭ci pr鱈kaz z~minibufferu}{M-p} +\key{nov邸鱈 alebo implicitn箪 pr鱈kaz z~minibufferu}{M-n} +\key{vyh直ada泥 regul叩rny v箪raz v~hist坦rii vzad}{M-r} +\key{vyh直ada泥 regul叩rny v箪raz v~hist坦rii vpred}{M-s} +\key{zru邸i泥 pr鱈kaz}{C-g} -Stlate \kbd{C-x ESC ESC} pre editovanie a zopakovanie poslednho prkazu -z~minibufferu. Stlate \kbd{F10} pre aktivciu menu v~minibufferi. +Stlate \kbd{C-x ESC ESC} pre editovanie a zopakovanie posledn辿ho pr鱈kazu +z~minibufferu. Stlate \kbd{F10} pre aktiv叩ciu menu v~minibufferi. \newcolumn -\title{GNU Emacs -- Referenn karta} +\title{GNU Emacs -- Referenn叩 karta} \section{Buffery} -\key{vybra in buffer}{C-x b} -\key{zoznam vetkch bufferov}{C-x C-b} -\key{zrui buffer}{C-x k} +\key{vybra泥 in箪 buffer}{C-x b} +\key{zoznam v邸etk箪ch bufferov}{C-x C-b} +\key{zru邸i泥 buffer}{C-x k} -\section{Vmeny} +\section{V箪meny} -\key{prehodi {\bf znaky}}{C-t} -\key{prehodi {\bf slov}}{M-t} -\key{prehodi {\bf riadky}}{C-x C-t} -\key{prehodi {\bf symbolick vrazy}}{C-M-t} +\key{prehodi泥 {\bf znaky}}{C-t} +\key{prehodi泥 {\bf slov叩}}{M-t} +\key{prehodi泥 {\bf riadky}}{C-x C-t} +\key{prehodi泥 {\bf symbolick辿 v箪razy}}{C-M-t} \section{Kontrola pravopisu} -\key{kontrola pravopisu aktulneho slova}{M-\$} -\metax{kontrola pravopisu vetkch slov v oblasti}{M-x ispell-region} -\metax{kontrola pravopisu celho bufferu}{M-x ispell-buffer} +\key{kontrola pravopisu aktu叩lneho slova}{M-\$} +\metax{kontrola pravopisu v邸etk箪ch slov v oblasti}{M-x ispell-region} +\metax{kontrola pravopisu cel辿ho bufferu}{M-x ispell-buffer} \section{Tagy} -\key{njs tag (definciu)}{M-.} -\key{njs al麹 vskyt tagu}{C-u M-.} -\metax{zada sbor s novmi tagmi}{M-x visit-tags-table} +\key{n叩js泥 tag (defin鱈ciu)}{M-.} +\key{n叩js泥 al邸鱈 v箪skyt tagu}{C-u M-.} +\metax{zada泥 s炭bor s nov箪mi tagmi}{M-x visit-tags-table} -\metax{vyhada reg.\ vraz v~sboroch s~tagmi}{M-x tags-search} -\metax{spusti nahradzovanie pre dotyn sbory}{M-x tags-query-replace} -\key{pokraova v~prehadvan alebo nahradzovan}{M-,} +\metax{vyh直ada泥 reg.\ v箪raz v~s炭boroch s~tagmi}{M-x tags-search} +\metax{spusti泥 nahradzovanie pre dotyn辿 s炭bory}{M-x tags-query-replace} +\key{pokraova泥 v~preh直ad叩van鱈 alebo nahradzovan鱈}{M-,} -\section{Prkazov interprt} +\section{Pr鱈kazov箪 interpr辿t} -\key{vykona shellovsk prkaz}{M-!} -\key{vykona shellovsk prkaz nad oblasou}{M-|} -\key{prefiltrova oblas shellovskm prkazom}{C-u M-|} -\key{spusti shell v okne \kbd{*shell*}}{M-x shell} +\key{vykona泥 shellovsk箪 pr鱈kaz}{M-!} +\key{vykona泥 shellovsk箪 pr鱈kaz nad oblas泥ou}{M-|} +\key{prefiltrova泥 oblas泥 shellovsk箪m pr鱈kazom}{C-u M-|} +\key{spusti泥 shell v okne \kbd{*shell*}}{M-x shell} -\section{Obd緇niky} +\section{Obd頂転niky} -\key{skoprova obd緇nik do registra}{C-x r r} -\key{zrui obd緇nik}{C-x r k} -\key{vhodi obd緇nik}{C-x r y} -\key{vloi obd緇nik medzier}{C-x r o} -\key{nahradi obd緇nik obd緇nikom medzier}{C-x r c} -\key{nahradi riadky obd緇niku zadanm reazcom}{C-x r t} +\key{skop鱈rova泥 obd頂転nik do registra}{C-x r r} +\key{zru邸i泥 obd頂転nik}{C-x r k} +\key{vhodi泥 obd頂転nik}{C-x r y} +\key{vlo転i泥 obd頂転nik medzier}{C-x r o} +\key{nahradi泥 obd頂転nik obd頂転nikom medzier}{C-x r c} +\key{nahradi泥 riadky obd頂転niku zadan箪m re泥azcom}{C-x r t} \section{Skratky} -\key{prida globlnu skratku}{C-x a g} -\key{prida loklnu skratku}{C-x a l} -\key{prida globlnu expanziu pre skratku }{C-x a i g} -\key{prida loklnu expanziu pre skratku}{C-x a i l} -\key{expandova skratku}{C-x a e} +\key{prida泥 glob叩lnu skratku}{C-x a g} +\key{prida泥 lok叩lnu skratku}{C-x a l} +\key{prida泥 glob叩lnu expanziu pre skratku }{C-x a i g} +\key{prida泥 lok叩lnu expanziu pre skratku}{C-x a i l} +\key{expandova泥 skratku}{C-x a e} -\key{dynamick expanzia predchdzajceho slova}{M-/} +\key{dynamick叩 expanzia predch叩dzaj炭ceho slova}{M-/} -\section{Regulrne vrazy} +\section{Regul叩rne v箪razy} -\key{ubovon znak okrem novho riadku}{. {\rm(teka)}} -\key{iadne alebo niekoko opakovan}{*} -\key{jedno alebo viac opakovan}{+} -\key{iadne alebo jedno opakovanie}{?} -\key{zrui zvl畊tny vznam znaku {\it c\/} vo vraze}{\\{\it c}} -\key{alternatva (\uv{alebo})}{\\|} +\key{直ubovo直n箪 znak okrem nov辿ho riadku}{. {\rm(teka)}} +\key{転iadne alebo nieko直ko opakovan鱈}{*} +\key{jedno alebo viac opakovan鱈}{+} +\key{転iadne alebo jedno opakovanie}{?} +\key{zru邸i泥 zvl叩邸tny v箪znam znaku {\it c\/} vo v箪raze}{\\{\it c}} +\key{alternat鱈va (\uv{alebo})}{\\|} \key{skupina}{\\( {\rm$\ldots$} \\)} -\key{rovnak text ako {\it n\/}-t skupina}{\\{\it n}} +\key{rovnak箪 text ako {\it n\/}-t叩 skupina}{\\{\it n}} \key{hranice slova}{\\b} \key{nie hranice slova}{\\B} \paralign to \hsize{#\tabskip=10pt plus 1 fil&#\tabskip=0pt&#\cr -\threecol{{\bf element}}{{\bf zaiatok}}{{\bf koniec}} +\threecol{{\bf element}}{{\bf zaiatok}}{{\bf koniec}} \threecol{riadok}{^}{\$} \threecol{slovo}{\\<}{\\>} \threecol{buffer}{\\`}{\\'} -\threecol{{\bf trieda znakov}}{{\bf zodpoved}}{{\bf nezodpoved}} -\threecol{explicitn mnoina}{[ {\rm$\ldots$} ]}{[^ {\rm$\ldots$} ]} -\threecol{slovotvorn znak}{\\w}{\\W} +\threecol{{\bf trieda znakov}}{{\bf zodpoved叩}}{{\bf nezodpoved叩}} +\threecol{explicitn叩 mno転ina}{[ {\rm$\ldots$} ]}{[^ {\rm$\ldots$} ]} +\threecol{slovotvorn箪 znak}{\\w}{\\W} \threecol{znak so syntaxou {\it c}}{\\s{\it c}}{\\S{\it c}} } -\section{Medzinrodn znakov sady} +\section{Medzin叩rodn辿 znakov辿 sady} -\metax{zada hlavn jazyk}{M-x set-language-environment} -\metax{zobrazi vetky vstupn metdy}{M-x list-input-methods} -\key{zapn alebo vypn vstupn metdu}{C-\\} -\key{zada kdovanie pre nasledujci prkaz}{C-x RET c} -\metax{zobrazi vetky kdovania}{M-x list-coding-systems} -\metax{zmeni preferovan kdovanie}{M-x prefer-coding-system} +\metax{zada泥 hlavn箪 jazyk}{M-x set-language-environment} +\metax{zobrazi泥 v邸etky vstupn辿 met坦dy}{M-x list-input-methods} +\key{zapn炭泥 alebo vypn炭泥 vstupn炭 met坦du}{C-\\} +\key{zada泥 k坦dovanie pre nasleduj炭ci pr鱈kaz}{C-x RET c} +\metax{zobrazi泥 v邸etky k坦dovania}{M-x list-coding-systems} +\metax{zmeni泥 preferovan辿 k坦dovanie}{M-x prefer-coding-system} \section{Info} -\key{spusti Info}{C-h i} -\key{njs zadan funkciu alebo premenn v~Info}{C-h C-i} +\key{spusti泥 Info}{C-h i} +\key{n叩js泥 zadan炭 funkciu alebo premenn炭 v~Info}{C-h C-i} \beginindentedkeys -Pohyb vo vntri uzlov: +Pohyb vo vn炭tri uzlov: \key{rolovanie vpred}{SPC} \key{rolovanie vzad}{DEL} -\key{na zaiatok uzla}{. {\rm (teka)}} +\key{na zaiatok uzla}{. {\rm (teka)}} Pohyb medzi uzlami: -\key{{\bf al麹} uzol}{n} -\key{{\bf predchdzajci} uzol}{p} -\key{{\bf nadraden} uzol}{u} -\key{vybra z~menu poda nzvu}{m} -\key{vybra {\it n\/}-t poloku menu (1--9)}{{\it n}} -\key{najbli捷 nasledujci kr躱ov odkaz (nvrat \kbd{l})}{f} -\key{vrti sa do naposledy prezeranho uzlu}{l} -\key{vrti sa do adresra uzlov}{d} -\key{prejs do ktorhokovek uzlu poda mena}{g} +\key{{\bf al邸鱈} uzol}{n} +\key{{\bf predch叩dzaj炭ci} uzol}{p} +\key{{\bf nadraden箪} uzol}{u} +\key{vybra泥 z~menu pod直a n叩zvu}{m} +\key{vybra泥 {\it n\/}-t炭 polo転ku menu (1--9)}{{\it n}} +\key{najbli転邸鱈 nasleduj炭ci kr鱈転ov箪 odkaz (n叩vrat \kbd{l})}{f} +\key{vr叩ti泥 sa do naposledy prezeran辿ho uzlu}{l} +\key{vr叩ti泥 sa do adres叩ra uzlov}{d} +\key{prejs泥 do ktor辿hoko直vek uzlu pod直a mena}{g} -alie: +al邸ie: -\key{spusti {\bf ttorial} k~Infu}{h} +\key{spusti泥 {\bf t炭torial} k~Infu}{h} % \key{look up a subject in the indices}{i} % FIXME -\key{vyhada reazec v uzloch}{M-s} -\key{{\bf skoni} Info}{q} +\key{vyh直ada泥 re泥azec v uzloch}{M-s} +\key{{\bf skoni泥} Info}{q} \endindentedkeys \section{Registre} -\key{uloi oblas do registra}{C-x r s} -\key{vloi obsah registra do buffera}{C-x r i} +\key{ulo転i泥 oblas泥 do registra}{C-x r s} +\key{vlo転i泥 obsah registra do buffera}{C-x r i} -\key{uloi pozciu kurzoru do registra}{C-x r SPC} -\key{skoi na pozciu uloen v~registri}{C-x r j} +\key{ulo転i泥 poz鱈ciu kurzoru do registra}{C-x r SPC} +\key{skoi泥 na poz鱈ciu ulo転en炭 v~registri}{C-x r j} -\section{Klvesov makr} +\section{Kl叩vesov辿 makr叩} -\key{{\bf zaa} definovanie klvesovho makra}{C-x (} -\key{{\bf skoni} definovanie klvesovho makra}{C-x )} -\key{{\bf vykona} naposledy definovan makro}{C-x e} -\key{pripoji k~poslednmu klvesovmu makru}{C-u C-x (} -\metax{pomenova posledn makro}{M-x name-last-kbd-macro} -\metax{vloi do buffera lispov definciu}{M-x insert-kbd-macro} +\key{{\bf zaa泥} definovanie kl叩vesov辿ho makra}{C-x (} +\key{{\bf skoni泥} definovanie kl叩vesov辿ho makra}{C-x )} +\key{{\bf vykona泥} naposledy definovan辿 makro}{C-x e} +\key{pripoji泥 k~posledn辿mu kl叩vesov辿mu makru}{C-u C-x (} +\metax{pomenova泥 posledn辿 makro}{M-x name-last-kbd-macro} +\metax{vlo転i泥 do buffera lispov炭 defin鱈ciu}{M-x insert-kbd-macro} -\section{Prkazy svisiace s~Emacs Lispom} +\section{Pr鱈kazy s炭visiace s~Emacs Lispom} -\key{vyhodnoti {\bf vraz} pred kurzorom}{C-x C-e} -\key{vyhodnoti {\bf funkciu} pod kurzorom}{C-M-x} -\metax{vyhodnoti {\bf oblas}}{M-x eval-region} -\key{na蓁ta a vyhodnoti vraz v~minibufferi}{M-:} -\metax{na蓁ta sbor zo systmovho adresra}{M-x load-library} +\key{vyhodnoti泥 {\bf v箪raz} pred kurzorom}{C-x C-e} +\key{vyhodnoti泥 {\bf funkciu} pod kurzorom}{C-M-x} +\metax{vyhodnoti泥 {\bf oblas泥}}{M-x eval-region} +\key{na鱈ta泥 a vyhodnoti泥 v箪raz v~minibufferi}{M-:} +\metax{na鱈ta泥 s炭bor zo syst辿mov辿ho adres叩ra}{M-x load-library} -\section{Jednoduch prispsobenia} +\section{Jednoduch辿 prisp担sobenia} -\metax{nastavi premenn a faces}{M-x customize} +\metax{nastavi泥 premenn辿 a faces}{M-x customize} % The intended audience here is the person who wants to make simple % customizations and knows Lisp syntax. -Defincia veobecnej klvesovej skratky v~Emacs Lispe (prklad): +Defin鱈cia v邸eobecnej kl叩vesovej skratky v~Emacs Lispe (pr鱈klad): \beginexample% (global-set-key "\\C-cg" 'goto-line) (global-set-key "\\M-\#" 'query-replace-regexp) \endexample -\section{Zpis prkazov} +\section{Z叩pis pr鱈kazov} \beginexample% (defun \ (\) @@ -645,7 +640,7 @@ Defin \) \endexample -Prklad: +Pr鱈klad: \beginexample% (defun this-line-to-top-of-window (line) @@ -657,8 +652,8 @@ With ARG, put point on line ARG." (prefix-numeric-value line)))) \endexample -pecifikcia \kbd{interactive} vrav, ako interaktvne na蓁ta ar\-gu\-men\-ty. -Viac sa dozviete po vykonan \kbd{C-h f interactive}. +pecifik叩cia \kbd{interactive} vrav鱈, ako interakt鱈vne na鱈ta泥 ar\-gu\-men\-ty. +Viac sa dozviete po vykonan鱈 \kbd{C-h f interactive}. \copyrightnotice @@ -666,6 +661,4 @@ Viac sa dozviete po vykonan % Local variables: % compile-command: "csplain sk-refcard" -% coding: iso-latin-2 % End: - diff --git a/etc/refcards/sk-survival.tex b/etc/refcards/sk-survival.tex index b7e3594..20d85b5 100644 --- a/etc/refcards/sk-survival.tex +++ b/etc/refcards/sk-survival.tex @@ -3,7 +3,7 @@ % Copyright (C) 2000-2014 Free Software Foundation, Inc. % Author: Wlodek Bzyl -% Czech translation: Pavel Jank , March 2001 +% Czech translation: Pavel Jan鱈k , March 2001 % Slovak translation: Miroslav Vasko , March 2001 % This file is part of GNU Emacs. @@ -55,11 +55,6 @@ % Slovak hyphenation rules applied \shyph -% Without this, pdfTeX 3.1415926-2.5-1.40.14 (TeX Live 2013/Debian) -% aborts with: "! UTF-8 INPUT IS CORRUPTED ! -% May be you are using another input encoding" -\input utf8off - \input emacsver.tex \def\copyrightnotice{\penalty-1\vfill @@ -67,12 +62,12 @@ Copyright \copyright\ \year\ Free Software Foundation, Inc.\break Pre GNU Emacs \versionemacs\break W{\l}odek Bzyl (matwb@univ.gda.pl)\break - Do etiny preloil Pavel Jank (Pavel@Janik.cz)\break - Do sloveniny preloil Miroslav Vako (vasko@debian.cz) + Do e邸tiny prelo転il Pavel Jan鱈k (Pavel@Janik.cz)\break + Do sloveniny prelo転il Miroslav Va邸ko (vasko@debian.cz) - Kpie tohto dokumentu mete vytvra a 麹ri - za predpokladu, e bud obsahova tto poznmku - o autorskch prvach.\par}} + K坦pie tohto dokumentu m担転ete vytv叩ra泥 a 邸鱈ri泥 + za predpokladu, 転e bud炭 obsahova泥 t炭to pozn叩mku + o autorsk箪ch pr叩vach.\par}} \hsize 3.2in \vsize 7.95in @@ -175,244 +170,244 @@ %**end of header -\title{Karta\ \ pre\ \ preitie\ \ s\ \ GNU\ \ Emacsom}{pre verziu \versionemacs} +\title{Karta\ \ pre\ \ pre転itie\ \ s\ \ GNU\ \ Emacsom}{pre verziu \versionemacs} -V~nasledujcom texte \kbd{C-z} znamen: stlate klvesu {\it Ctrl}, drte ju -a sasne stlate klvesu `\kbd{z}'. \kbd{M-z} znamen, e -sasne s klvesou {\it Meta\/} stla蓁te klvesu `\kbd{z}' ({\it Meta\/} je -v粫inou oznaen ako {\it Alt\/}) alebo mete poui stlaenie -klvesy {\it Esc\/} a potom `\kbd{z}'. +V~nasleduj炭com texte \kbd{C-z} znamen叩: stlate kl叩vesu {\it Ctrl}, dr転te ju +a s炭asne stlate kl叩vesu `\kbd{z}'. \kbd{M-z} znamen叩, 転e +s炭asne s kl叩vesou {\it Meta\/} stla鱈te kl叩vesu `\kbd{z}' ({\it Meta\/} je +v辰邸inou oznaen叩 ako {\it Alt\/}) alebo m担転ete pou転i泥 stlaenie +kl叩vesy {\it Esc\/} a potom `\kbd{z}'. \section{Spustenie Emacsu} -Pre spustenie GNU Emacsu jednoducho nap躪te jeho meno: \kbd{emacs}. -Emacs rozdeuje rmec na niekoko ast: +Pre spustenie GNU Emacsu jednoducho nap鱈邸te jeho meno: \kbd{emacs}. +Emacs rozde直uje r叩mec na nieko直ko ast鱈: riadok menu, - buffer s editovanm textom, - tzv. mode line popisujca buffer nad ou + buffer s editovan箪m textom, + tzv. mode line popisuj炭ca buffer nad ou a minibuffer v poslednom riadku. \askip -\key{C-x C-c} ukonenie Emacsu -\key{C-x C-f} editovanie sboru; tento prkaz vyu壌va minibuffer na pre蓁tanie - mena sboru; tento prkaz pouite aj vtedy, ak chcete - vytvori nov sbor zadanho mena -\key{C-x C-s} uloi sbor -\key{C-x k} zatvori buffer -\key{C-g} vo v粫ine situci: zastavenie prve vykonvanej innosti, - zruenie zadvania prkazu a~pod. -\key{C-x u} obnovi +\key{C-x C-c} ukonenie Emacsu +\key{C-x C-f} editovanie s炭boru; tento pr鱈kaz vyu転鱈va minibuffer na pre鱈tanie + mena s炭boru; tento pr鱈kaz pou転ite aj vtedy, ak chcete + vytvori泥 nov箪 s炭bor zadan辿ho mena +\key{C-x C-s} ulo転i泥 s炭bor +\key{C-x k} zatvori泥 buffer +\key{C-g} vo v辰邸ine situ叩ci鱈: zastavenie pr叩ve vykon叩vanej innosti, + zru邸enie zad叩vania pr鱈kazu a~pod. +\key{C-x u} obnovi泥 \section{Pohyb} -\key{C-l} presun aktulneho riadku do stredu okna -\key{C-x b} prepnutie do inho bufferu -\key{M-<} presun na zaiatok bufferu +\key{C-l} presun aktu叩lneho riadku do stredu okna +\key{C-x b} prepnutie do in辿ho bufferu +\key{M-<} presun na zaiatok bufferu \key{M->} presun na koniec bufferu -\key{M-x goto-line} presun na riadok zadanho 蓁sla +\key{M-x goto-line} presun na riadok zadan辿ho 鱈sla \section{Viac okien} -\key{C-x 0} odstrnenie aktulneho okna -\key{C-x 1} aktulne okno sa stane jedinm oknom -\key{C-x 2} rozdelenie okna horizontlne -\key{C-x 3} rozdelenie okna vertiklne -\key{C-x o} presun do inho okna +\key{C-x 0} odstr叩nenie aktu叩lneho okna +\key{C-x 1} aktu叩lne okno sa stane jedin箪m oknom +\key{C-x 2} rozdelenie okna horizont叩lne +\key{C-x 3} rozdelenie okna vertik叩lne +\key{C-x o} presun do in辿ho okna -\section{Reginy} +\section{Regi坦ny} -Emacs definuje `regin' ako priestor medzi {\it znakou\/} a -{\it bodom}. Znaka je nastaven pomocou \kbd{C-{\it space}}. -Bod je v mieste aktulnej pozcie kurzoru. +Emacs definuje `regi坦n' ako priestor medzi {\it znakou\/} a +{\it bodom}. Znaka je nastaven叩 pomocou \kbd{C-{\it space}}. +Bod je v mieste aktu叩lnej poz鱈cie kurzoru. \askip -\key{M-h} ozna cel odstavec -\key{C-x h} ozna cel buffer +\key{M-h} ozna cel箪 odstavec +\key{C-x h} ozna cel箪 buffer -\section{Vystrihnutie a koprovanie} +\section{Vystrihnutie a kop鱈rovanie} -\key{C-w} vystrihni regin -\key{M-w} skopruj regin do kill-ringu +\key{C-w} vystrihni regi坦n +\key{M-w} skop鱈ruj regi坦n do kill-ringu \key{C-k} vystrihni text od kurzora do konca riadku \key{M-DEL} vystrihni slovo -\key{C-y} vlo sp篁 posledn vystrihnut text (kombincia klves \kbd{C-w C-y} - me by pouit pre presuny textov) -\key{M-y} nahra naposledy vloen text predchdzajcim vystrihnutm textom +\key{C-y} vlo転 sp辰泥 posledn箪 vystrihnut箪 text (kombin叩cia kl叩ves \kbd{C-w C-y} + m担転e by泥 pou転it叩 pre presuny textov) +\key{M-y} nahra naposledy vlo転en箪 text predch叩dzaj炭cim vystrihnut箪m textom -\section{Vyhadvanie} +\section{Vyh直ad叩vanie} -\key{C-s} hadaj reazec -\key{C-r} hadaj reazec smerom vzad -\key{RET} ukoni hadanie -\key{M-C-s} hadaj regulrny vraz -\key{M-C-r} hadaj regulrny vraz smerom vzad +\key{C-s} h直adaj re泥azec +\key{C-r} h直adaj re泥azec smerom vzad +\key{RET} ukoni h直adanie +\key{M-C-s} h直adaj regul叩rny v箪raz +\key{M-C-r} h直adaj regul叩rny v箪raz smerom vzad \askip -Kombinciu \kbd{C-s} alebo \kbd{C-r} mete poui aj na opakovan hadanie -tm istm smerom. +Kombin叩ciu \kbd{C-s} alebo \kbd{C-r} m担転ete pou転i泥 aj na opakovan辿 h直adanie +t箪m ist箪m smerom. -\section{Znaky (tags)} +\section{Znaky (tags)} -Tabuky znaiek (tags) zaznamenvaj polohu funkci a procedr, globlnych -premennch, dtovch typov a inch. Pre vytvorenie tabuky znaiek spustite -prkaz `{\tt etags} {\it vstupn\_sbory}' v prkazovom interprtereri. +Tabu直ky znaiek (tags) zaznamen叩vaj炭 polohu funkci鱈 a proced炭r, glob叩lnych +premenn箪ch, d叩tov箪ch typov a in箪ch. Pre vytvorenie tabu直ky znaiek spustite +pr鱈kaz `{\tt etags} {\it vstupn辿\_s炭bory}' v pr鱈kazovom interpr辿tereri. \askip -\key{M-.} njdi defincu -\key{C-u M-.} njdi al麹 vskyt defincie -\key{M-*} cho tam, odkia bola volan posledn \kbd{M-.} -\mkey{M-x tags-query-replace} spusti query-replace na vetkch sboroch -zaznamenanch v tabuke znaiek. -\key{M-,} pokrauj v poslednom hadan znaky alebo query-replace +\key{M-.} n叩jdi defin鱈cu +\key{C-u M-.} n叩jdi al邸鱈 v箪skyt defin鱈cie +\key{M-*} cho tam, odkia直 bola volan叩 posledn叩 \kbd{M-.} +\mkey{M-x tags-query-replace} spusti query-replace na v邸etk箪ch s炭boroch +zaznamenan箪ch v tabu直ke znaiek. +\key{M-,} pokrauj v poslednom h直adan鱈 znaky alebo query-replace \section{Preklady} -\key{M-x compile} prelo kd v aktvnom okne -\key{C-c C-c} cho na posledn chybu prekladaa, v okne prekladu -\key{C-x `} v okne so zdrojovm textom +\key{M-x compile} prelo転 k坦d v akt鱈vnom okne +\key{C-c C-c} cho na posledn炭 chybu prekladaa, v okne prekladu +\key{C-x `} v okne so zdrojov箪m textom -\section{Dired, editor adresrov} +\section{Dired, editor adres叩rov} \key{C-x d} spusti Dired -\key{d} ozna tento sbor na zmazanie -\key{\~{}} ozna vetky zlohy na zmazanie -\key{u} odstr癇 vetky znaky na zmazanie -\key{x} zma sbory oznaen na zmazanie -\key{C} kopruj sbor +\key{d} ozna tento s炭bor na zmazanie +\key{\~{}} ozna v邸etky z叩lohy na zmazanie +\key{u} odstr叩 v邸etky znaky na zmazanie +\key{x} zma転 s炭bory oznaen辿 na zmazanie +\key{C} kop鱈ruj s炭bor \key{g} obnov buffer Diredu -\key{f} otvor sbor v aktulnom riadku -\key{s} prepni medzi triedenm poda abecedy a dtumu/asu +\key{f} otvor鱈 s炭bor v aktu叩lnom riadku +\key{s} prepni medzi trieden鱈m pod直a abecedy a d叩tumu/asu -\section{罷tanie a posielanie poty} +\section{鱈tanie a posielanie po邸ty} -\key{M-x rmail} zani 蓁ta potu -\key{q} skoni 蓁tanie poty -\key{h} uk畩 hlaviky -\key{d} ozna aktulnu sprvu na zmazanie -\key{x} zma vetky sprvy oznaen na zmazanie +\key{M-x rmail} zani 鱈ta泥 po邸tu +\key{q} skoni 鱈tanie po邸ty +\key{h} uk叩転 hlaviky +\key{d} ozna aktu叩lnu spr叩vu na zmazanie +\key{x} zma転 v邸etky spr叩vy oznaen辿 na zmazanie -\key{C-x m} nov sprva -\key{C-c C-c} poli sprvu a prepni sa do inho bufferu -\key{C-c C-f C-c} presu sa na hlaviku `CC', a ak neexistuje, tak ju +\key{C-x m} nov叩 spr叩va +\key{C-c C-c} po邸li spr叩vu a prepni sa do in辿ho bufferu +\key{C-c C-f C-c} presu sa na hlaviku `CC', a ak neexistuje, tak ju vytvor -\section{Rzne} +\section{R担zne} \key{M-q} zarovnaj odstavec -\key{M-/} dopl dynamicky predchdzajce slovo -\key{C-z} ikonizuj (preru) Emacs -\mkey{M-x revert-buffer} nahra text editovanho sboru tm istm sborom z~disku +\key{M-/} dopl dynamicky predch叩dzaj炭ce slovo +\key{C-z} ikonizuj (preru邸) Emacs +\mkey{M-x revert-buffer} nahra text editovan辿ho s炭boru t箪m ist箪m s炭borom z~disku \section{Nahradzovanie} -\key{M-\%} interaktvne hadaj a nahradzuj -\key{M-C-\%} s pouitm regulrnych vrazov +\key{M-\%} interakt鱈vne h直adaj a nahradzuj +\key{M-C-\%} s pou転it鱈m regul叩rnych v箪razov \askip -Mon odpovede v mde hadania s +Mo転n辿 odpovede v m坦de h直adania s炭 \askip -\key{SPC} nahra tento vskyt; cho na al麹 -\key{,} nahra tento vskyt a skoni -\key{DEL} tento vskyt nenahradzuj a cho alej -\key{!} nahra vetky alie vskyty -\key{\^{}} sp篁 na predchdzajci vskyt -\key{RET} skoni query-replace -\key{C-r} zani rekurzvne editovanie (\kbd{M-C-c} ho skon蓁) - -\section{Regulrne vrazy} - -\key{. {\rm(teka)}} ubovon znak okrem znaku novho riadku -\key{*} iadne alebo viac opakovan -\key{+} jedno alebo viac opakovan -\key{?} iadne alebo jedno opakovanie -\key{[$\ldots$]} oznauje triedu znakov +\key{SPC} nahra tento v箪skyt; cho na al邸鱈 +\key{,} nahra tento v箪skyt a skoni +\key{DEL} tento v箪skyt nenahradzuj a cho alej +\key{!} nahra v邸etky al邸ie v箪skyty +\key{\^{}} sp辰泥 na predch叩dzaj炭ci v箪skyt +\key{RET} skoni query-replace +\key{C-r} zani rekurz鱈vne editovanie (\kbd{M-C-c} ho skon鱈) + +\section{Regul叩rne v箪razy} + +\key{. {\rm(teka)}} 直ubovo直n箪 znak okrem znaku nov辿ho riadku +\key{*} 転iadne alebo viac opakovan鱈 +\key{+} jedno alebo viac opakovan鱈 +\key{?} 転iadne alebo jedno opakovanie +\key{[$\ldots$]} oznauje triedu znakov \key{[\^{}$\ldots$]} neguje triedu znakov -\key{\\{\it c}} uvedenie znaku, ktor by mal inak pecilny vznam -v~regulrnom vraze +\key{\\{\it c}} uvedenie znaku, ktor箪 by mal inak 邸peci叩lny v箪znam +v~regul叩rnom v箪raze -\key{$\ldots$\\|$\ldots$\\|$\ldots$} vyhovuje jednej z alternatv (\uv{alebo}) -\key{\\( $\ldots$ \\)} zoskupenie niekokch vzorkov do jednho -\key{\\{\it n}} to ist ako {\it n\/}-t skupina +\key{$\ldots$\\|$\ldots$\\|$\ldots$} vyhovuje jednej z alternat鱈v (\uv{alebo}) +\key{\\( $\ldots$ \\)} zoskupenie nieko直k箪ch vzorkov do jedn辿ho +\key{\\{\it n}} to ist辿 ako {\it n\/}-t叩 skupina -\key{\^{}} vyhovuje na zaiatku riadku +\key{\^{}} vyhovuje na zaiatku riadku \key{\$} vyhovuje na konci riadku -\key{\\w} vyhovuje znaku, ktor me by sasou slova -\key{\\W} vyhovuje znaku, ktor neme by sasou slova -\key{\\<} vyhovuje na zaiatku slova +\key{\\w} vyhovuje znaku, ktor箪 m担転e by泥 s炭as泥ou slova +\key{\\W} vyhovuje znaku, ktor箪 nem担転e by泥 s炭as泥ou slova +\key{\\<} vyhovuje na zaiatku slova \key{\\>} vyhovuje na konci slova -\key{\\b} vyhovuje medzislovnm medzerm -\key{\\B} vyhovuje medzerm, ktor nie s medzislovn +\key{\\b} vyhovuje medzislovn箪m medzer叩m +\key{\\B} vyhovuje medzer叩m, ktor辿 nie s炭 medzislovn辿 \section{Registre} -\key{C-x r s} ulo regin do registra -\key{C-x r i} vlo obsah registra do bufferu +\key{C-x r s} ulo転 regi坦n do registra +\key{C-x r i} vlo転 obsah registra do bufferu -\key{C-x r SPC} ulo aktulnu pozciu kurzora do registra -\key{C-x r j} sko na pozciu kurzoru uloen v registri +\key{C-x r SPC} ulo転 aktu叩lnu poz鱈ciu kurzora do registra +\key{C-x r j} sko na poz鱈ciu kurzoru ulo転en炭 v registri -\section{Obd緇niky} +\section{Obd頂転niky} -\key{C-x r r} skopruj obd緇nik do registra -\key{C-x r k} vystrihni obd緇nik -\key{C-x r y} vlo obd緇nik -\key{C-x r t} uvedenie kadho riadku reazcom +\key{C-x r r} skop鱈ruj obd頂転nik do registra +\key{C-x r k} vystrihni obd頂転nik +\key{C-x r y} vlo転 obd頂転nik +\key{C-x r t} uvedenie ka転d辿ho riadku re泥azcom -\key{C-x r o} otvor obd緇nik, posu text vpravo -\key{C-x r c} vyprzdni obd緇nik +\key{C-x r o} otvor obd頂転nik, posu text vpravo +\key{C-x r c} vypr叩zdni obd頂転nik -\section{Prkazov interprter} +\section{Pr鱈kazov箪 interpr辿ter} -\key{M-x shell} spusti prkazov interprter v Emacsu -\key{M-!} spusti prkaz prkazovho interprtera -\key{M-|} spusti prkaz prkazovho interprtera na regine -\key{C-u M-|} filtruj regin cez prkaz prkazovho interprtera +\key{M-x shell} spusti pr鱈kazov箪 interpr辿ter v Emacsu +\key{M-!} spusti pr鱈kaz pr鱈kazov辿ho interpr辿tera +\key{M-|} spusti pr鱈kaz pr鱈kazov辿ho interpr辿tera na regi坦ne +\key{C-u M-|} filtruj regi坦n cez pr鱈kaz pr鱈kazov辿ho interpr辿tera \section{Kontrola pravopisu} \key{M-\$} skontroluj pravopis slova pod kurzorom -\mkey{M-x ispell-region} skontroluj pravopis vetkch slov v regine +\mkey{M-x ispell-region} skontroluj pravopis v邸etk箪ch slov v regi坦ne \mkey{M-x ispell-buffer} skontroluj pravopis v bufferi -\section{Mezinrodn znakov sady} +\section{Mezin叩rodn辿 znakov辿 sady} -\key{C-x RET C-\\} zvo a aktivuj vstupn metdu pre aktulny buffer -\key{C-\\} aktivuj alebo deaktivuj vstupn metdu -\mkey{M-x list-input-methods} zobraz zoznam vetkch vstupnch metd -\mkey{M-x set-language-environment} pecifikuj hlavn jazyk +\key{C-x RET C-\\} zvo直 a aktivuj vstupn炭 met坦du pre aktu叩lny buffer +\key{C-\\} aktivuj alebo deaktivuj vstupn炭 met坦du +\mkey{M-x list-input-methods} zobraz zoznam v邸etk箪ch vstupn箪ch met坦d +\mkey{M-x set-language-environment} 邸pecifikuj hlavn箪 jazyk -\key{C-x RET c} nastav kdovac systm pre nasledujci prkaz -\mkey{M-x find-file-literally} edituj sbor bez akchkovek konverzi +\key{C-x RET c} nastav k坦dovac鱈 syst辿m pre nasleduj炭ci pr鱈kaz +\mkey{M-x find-file-literally} edituj s炭bor bez ak箪chko直vek konverzi鱈 -\mkey{M-x list-coding-systems} uk畩 vetky kdovacie systmy -\mkey{M-x prefer-coding-system} zvo preferovan kdovac systm +\mkey{M-x list-coding-systems} uk叩転 v邸etky k坦dovacie syst辿my +\mkey{M-x prefer-coding-system} zvo直 preferovan箪 k坦dovac鱈 syst辿m -\section{Klvesov makr} +\section{Kl叩vesov辿 makr叩} -\key{C-x (} zani definciu klvesovho makra -\key{C-x )} ukoni definciu klvesovho makra -\key{C-x e} spusti naposledy definovan klvesov makro -\key{C-u C-x (} pridaj do naposledy definovanho klvesovho makra -\mkey{M-x name-last-kbd-macro} pomenuj naposledy definovan makro +\key{C-x (} zani defin鱈ciu kl叩vesov辿ho makra +\key{C-x )} ukoni defin鱈ciu kl叩vesov辿ho makra +\key{C-x e} spusti naposledy definovan辿 kl叩vesov辿 makro +\key{C-u C-x (} pridaj do naposledy definovan辿ho kl叩vesov辿ho makra +\mkey{M-x name-last-kbd-macro} pomenuj naposledy definovan辿 makro -\section{Jednoduch nastavenie} +\section{Jednoduch辿 nastavenie} -\key{M-x customize} jednoduch nastavenie +\key{M-x customize} jednoduch辿 nastavenie -\section{Npoveda} +\section{N叩poveda} -Emacs dop纈a prkazy. Ak stla蓁te \kbd{M-x} {\it tab\/} alebo {\it -space\/}, dostanete zoznam prkazov Emacsu. +Emacs dop頂a pr鱈kazy. Ak stla鱈te \kbd{M-x} {\it tab\/} alebo {\it +space\/}, dostanete zoznam pr鱈kazov Emacsu. \askip -\key{C-h} npoveda Emacsu -\key{C-h t} spust ttorial Emacsu -\key{C-h i} spust Info, prezera dokumentcie -\key{C-h a} uk畩e prkazy vyhovujce zadanmu reazcu (apropos) -\key{C-h k} zobraz dokumentciu funkcie spustenej pomocou zadanej klvesy +\key{C-h} n叩poveda Emacsu +\key{C-h t} spust鱈 t炭torial Emacsu +\key{C-h i} spust鱈 Info, prezera dokument叩cie +\key{C-h a} uk叩転e pr鱈kazy vyhovuj炭ce zadan辿mu re泥azcu (apropos) +\key{C-h k} zobraz鱈 dokument叩ciu funkcie spustenej pomocou zadanej kl叩vesy \askip -Emacs pracuje v rznych {\it mdoch}, ktor upravuj chovanie -Emacsu pre editovan text danho typu. Mode line obsahuje men aktulnych -mdov v ztvorkch. +Emacs pracuje v r担znych {\it m坦doch}, ktor辿 upravuj炭 chovanie +Emacsu pre editovan箪 text dan辿ho typu. Mode line obsahuje men叩 aktu叩lnych +m坦dov v z叩tvork叩ch. \askip -\key{C-h m} zobraz dokumentciu aktulnych mdov. +\key{C-h m} zobraz dokument叩ciu aktu叩lnych m坦dov. \copyrightnotice @@ -420,5 +415,4 @@ m % Local variables: % compile-command: "csplain sk-survival" -% coding: iso-latin-2 % End: commit 4ea175894a02c2e0a7a0da34c4e1181f9b8b2bea Author: Andreas Schwab Date: Sat Dec 13 19:03:31 2014 +0100 * net/shr.el (shr-next-link): Don't error out at eob. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 27337e9..37f637b 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2014-12-13 Andreas Schwab + + * net/shr.el (shr-next-link): Don't error out at eob. + 2014-12-05 Nicolas Richard * isearch.el (isearch-open-necessary-overlays): Open overlay diff --git a/lisp/net/shr.el b/lisp/net/shr.el index 15dd8df..6e06a76 100644 --- a/lisp/net/shr.el +++ b/lisp/net/shr.el @@ -265,8 +265,9 @@ redirects somewhere else." "Skip to the next link." (interactive) (let ((skip (text-property-any (point) (point-max) 'help-echo nil))) - (if (not (setq skip (text-property-not-all skip (point-max) - 'help-echo nil))) + (if (or (eobp) + (not (setq skip (text-property-not-all skip (point-max) + 'help-echo nil)))) (message "No next link") (goto-char skip) (message "%s" (get-text-property (point) 'help-echo))))) commit 30f603836c64a045fa59b5258d09b99da582eb75 Author: Nicolas Richard Date: Sat Dec 13 16:54:14 2014 +0100 isearch-open-necessary-overlays: Open overlay ending at point * lisp/isearch.el (isearch-open-necessary-overlays): Open overlay ending at point (bug#19333). diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 7ec7feb..27337e9 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2014-12-05 Nicolas Richard + + * isearch.el (isearch-open-necessary-overlays): Open overlay + ending at point (bug#19333). + 2014-12-13 Lars Magne Ingebrigtsen * net/shr.el (shr-fold-text): New function. diff --git a/lisp/isearch.el b/lisp/isearch.el index c3e473a..ef0c4a7 100644 --- a/lisp/isearch.el +++ b/lisp/isearch.el @@ -2734,7 +2734,7 @@ update the match data, and return point." ;; in any of these overlays, se we are safe in this case too. (defun isearch-open-necessary-overlays (ov) (let ((inside-overlay (and (> (point) (overlay-start ov)) - (< (point) (overlay-end ov)))) + (<= (point) (overlay-end ov)))) ;; If this exists it means that the overlay was opened using ;; this function, not by us tweaking the overlay properties. (fct-temp (overlay-get ov 'isearch-open-invisible-temporary))) commit 05beff88de02f0a70f20c06c5e8af73ef3002bff Author: Lars Magne Ingebrigtsen Date: Sat Dec 13 16:32:17 2014 +0100 (shr-fold-text): Inhibit state from being altered. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 5caf376..7ec7feb 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -3,6 +3,7 @@ * net/shr.el (shr-fold-text): New function. (shr-show-alt-text, shr-urlify, shr-tag-img): Use it to fold long alt/title texts. + (shr-fold-text): Inhibit state from being altered. * files.el (directory-files-recursively): Really check whether files are symlinks. diff --git a/lisp/net/shr.el b/lisp/net/shr.el index 2fff360..15dd8df 100644 --- a/lisp/net/shr.el +++ b/lisp/net/shr.el @@ -415,6 +415,8 @@ size, and full-buffer size." (defun shr-fold-text (text) (with-temp-buffer (let ((shr-indentation 0) + (shr-state nil) + (shr-start nil) (shr-internal-width (window-width))) (shr-insert text) (buffer-string)))) commit 76f9994d677e0440584216e4e47be37e2d3dc312 Author: Lars Magne Ingebrigtsen Date: Sat Dec 13 16:23:40 2014 +0100 Make shr fold long title texts * net/shr.el (shr-fold-text): New function. (shr-show-alt-text, shr-urlify, shr-tag-img): Use it to fold long alt/title texts. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 6955c3c..5caf376 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,9 @@ 2014-12-13 Lars Magne Ingebrigtsen + * net/shr.el (shr-fold-text): New function. + (shr-show-alt-text, shr-urlify, shr-tag-img): Use it to fold long + alt/title texts. + * files.el (directory-files-recursively): Really check whether files are symlinks. (directory-name-p): New function. diff --git a/lisp/net/shr.el b/lisp/net/shr.el index 695b91d..2fff360 100644 --- a/lisp/net/shr.el +++ b/lisp/net/shr.el @@ -301,7 +301,7 @@ redirects somewhere else." (let ((text (get-text-property (point) 'shr-alt))) (if (not text) (message "No image under point") - (message "%s" text)))) + (message "%s" (shr-fold-text text))))) (defun shr-browse-image (&optional copy-url) "Browse the image under point. @@ -412,6 +412,13 @@ size, and full-buffer size." (cdr (assq 'color shr-stylesheet)) (cdr (assq 'background-color shr-stylesheet)))))))) +(defun shr-fold-text (text) + (with-temp-buffer + (let ((shr-indentation 0) + (shr-internal-width (window-width))) + (shr-insert text) + (buffer-string)))) + (define-inline shr-char-breakable-p (char) "Return non-nil if a line can be broken before and after CHAR." (inline-quote (aref fill-find-break-point-function-table ,char))) @@ -881,7 +888,7 @@ START, and END. Note that START and END should be markers." (add-text-properties start (point) (list 'shr-url url - 'help-echo (if title (format "%s (%s)" url title) url) + 'help-echo (if title (shr-fold-text (format "%s (%s)" url title)) url) 'follow-link t 'mouse-face 'highlight 'keymap shr-map))) @@ -1283,7 +1290,7 @@ The preference is a float determined from `shr-prefer-media-type'." (put-text-property start (point) 'image-displayer (shr-image-displayer shr-content-function)) (put-text-property start (point) 'help-echo - (or (dom-attr dom 'title) alt))) + (shr-fold-text (or (dom-attr dom 'title) alt)))) (setq shr-state 'image))))) (defun shr-tag-pre (dom) commit 987d2f9421bc854893673c234c02479583476785 Author: Lars Magne Ingebrigtsen Date: Sat Dec 13 16:10:04 2014 +0100 Implement a new function `directory-name-p' * doc/lispref/files.texi (Relative File Names): Mention `directory-name-p'. * etc/NEWS: Mention directory-name-p. (directory-name-p): New function. (directory-files-recursively): Use it. diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index 8f06881..0d8458f 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -1,3 +1,7 @@ +2014-12-13 Lars Magne Ingebrigtsen + + * files.texi (Relative File Names): Mention `directory-name-p'. + 2014-12-13 Eli Zaretskii * text.texi (Comparing Text): Prevent a text string from being diff --git a/doc/lispref/files.texi b/doc/lispref/files.texi index 92bb718..b79d5df 100644 --- a/doc/lispref/files.texi +++ b/doc/lispref/files.texi @@ -2020,6 +2020,11 @@ form. @end example @end defun +@defun directory-name-p filename +This function returns non-@code{nil} if @var{filename} ends with a +forward slash (@samp{/}) character. +@end defun + @node Directory Names @subsection Directory Names @cindex directory name diff --git a/etc/ChangeLog b/etc/ChangeLog index f56fb4e..5e02fce 100644 --- a/etc/ChangeLog +++ b/etc/ChangeLog @@ -1,3 +1,7 @@ +2014-12-13 Lars Magne Ingebrigtsen + + * NEWS: Mention directory-name-p. + 2014-12-09 Lars Magne Ingebrigtsen * NEWS: Mention directory-files-recursively. diff --git a/etc/NEWS b/etc/NEWS index 58a5836..58e4b0e 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -140,6 +140,11 @@ library function `ftw'. ** A new function `directory-files-recursively' returns all matching files (recursively) under a directory. +** The new `directory-name-p' can be used to check whether a file +name (as returned from, for instance, `file-name-all-completions' is +a directory file name. It returns non-nil if the last character in +the name is a forward slash. + * Editing Changes in Emacs 25.1 diff --git a/lisp/ChangeLog b/lisp/ChangeLog index bc75718..6955c3c 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -2,6 +2,8 @@ * files.el (directory-files-recursively): Really check whether files are symlinks. + (directory-name-p): New function. + (directory-files-recursively): Use it. 2014-12-13 Artur Malabarba diff --git a/lisp/files.el b/lisp/files.el index 2ab740d..d55ef1a 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -761,6 +761,11 @@ prevented. Directory entries are sorted with string-lessp." (file-name-nondirectory dir) args)))) +(defsubst directory-name-p (name) + "Return non-nil if NAME ends with a slash character." + (and (> (length name) 0) + (char-equal (aref name (1- (length name))) ?/))) + (defun directory-files-recursively (dir match &optional include-directories) "Return all files under DIR that have file names matching MATCH (a regexp). This function works recursively. Files are returned in \"depth first\" @@ -771,7 +776,7 @@ If INCLUDE-DIRECTORIES, also include directories that have matching names." (dolist (file (sort (file-name-all-completions "" dir) 'string<)) (unless (member file '("./" "../")) - (if (= (aref file (1- (length file))) ?/) + (if (directory-name-p file) (let* ((leaf (substring file 0 (1- (length file)))) (path (expand-file-name leaf dir))) ;; Don't follow symlinks to other directories. commit 3e8e9713565c3cfacc33763e789514d5960c59e2 Author: Lars Magne Ingebrigtsen Date: Sat Dec 13 15:50:28 2014 +0100 directory-files-recursively symlink fix * files.el (directory-files-recursively): Really check whether files are symlinks. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index afe4b35..bc75718 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2014-12-13 Lars Magne Ingebrigtsen + + * files.el (directory-files-recursively): Really check whether + files are symlinks. + 2014-12-13 Artur Malabarba * emacs-lisp/package.el (package--list-loaded-files): New function diff --git a/lisp/files.el b/lisp/files.el index 40972d4..2ab740d 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -772,14 +772,14 @@ If INCLUDE-DIRECTORIES, also include directories that have matching names." 'string<)) (unless (member file '("./" "../")) (if (= (aref file (1- (length file))) ?/) - (let ((path (expand-file-name file dir))) + (let* ((leaf (substring file 0 (1- (length file)))) + (path (expand-file-name leaf dir))) ;; Don't follow symlinks to other directories. (unless (file-symlink-p path) (setq result (nconc result (directory-files-recursively path match include-directories)))) (when (and include-directories - (string-match match - (substring file 0 (1- (length file))))) + (string-match match leaf)) (setq result (nconc result (list path))))) (when (string-match match file) (push (expand-file-name file dir) files))))) commit c13baa10d55ec863d3ceaea48c6b2959ece98198 Author: Artur Malabarba Date: Sat Dec 13 12:25:31 2014 +0000 emacs-lisp/package.el (package-activate-1): Reload package after upgrade After installing a package, reloads files returned by `package--list-loaded-files'. Fix bug#10125, bug#18443, and bug#18448. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index bc34066..afe4b35 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -3,6 +3,8 @@ * emacs-lisp/package.el (package--list-loaded-files): New function to list files in a given directory which correspond to already loaded files. + (package-activate-1): Reload files given by `package--list-loaded-files'. + Fix bug#10125, bug#18443, and bug#18448. 2014-12-13 Eric S. Raymond diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el index 654ad3a..e424e30 100644 --- a/lisp/emacs-lisp/package.el +++ b/lisp/emacs-lisp/package.el @@ -524,15 +524,27 @@ Return the max version (as a string) if the package is held at a lower version." (error "Internal error: unable to find directory for `%s'" (package-desc-full-name pkg-desc))) ;; Add to load path, add autoloads, and activate the package. - (let ((old-lp load-path)) - (with-demoted-errors - (load (expand-file-name (format "%s-autoloads" name) pkg-dir) nil t)) + (let* ((old-lp load-path) + (autoloads-file (expand-file-name + (format "%s-autoloads" name) pkg-dir)) + (loaded-files-list (package--list-loaded-files pkg-dir))) + (with-demoted-errors (format "Error loading %s: %%s" name) + (load autoloads-file nil t)) (when (and (eq old-lp load-path) (not (or (member pkg-dir load-path) (member pkg-dir-dir load-path)))) ;; Old packages don't add themselves to the `load-path', so we have to ;; do it ourselves. - (push pkg-dir load-path))) + (push pkg-dir load-path)) + ;; Call `load' on all files in `pkg-dir' already present in + ;; `load-history'. This is done so that macros in these files are updated + ;; to their new definitions. If another package is being installed which + ;; depends on this new definition, not doing this update would cause + ;; compilation errors and break the installation. + (with-demoted-errors (format "Error loading %s: %%s" name) + (mapc (lambda (feature) (load feature nil t)) + ;; Skip autoloads file since we already evaluated it above. + (remove (file-truename autoloads-file) loaded-files-list)))) ;; Add info node. (when (file-exists-p (expand-file-name "dir" pkg-dir)) ;; FIXME: not the friendliest, but simple. commit afd801f9a7a5e025394d89dae798ac81bfc2d46d Author: Artur Malabarba Date: Sat Dec 13 11:48:08 2014 +0000 emacs-lisp/package.el (package--list-loaded-files): New function List files in a given directory which correspond to already loaded files. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index f3d56c9..bc34066 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2014-12-13 Artur Malabarba + + * emacs-lisp/package.el (package--list-loaded-files): New function + to list files in a given directory which correspond to already + loaded files. + 2014-12-13 Eric S. Raymond * vc/vc-svn.el (vc-svn-diff): Fix bug #19312. diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el index 4e5c397..654ad3a 100644 --- a/lisp/emacs-lisp/package.el +++ b/lisp/emacs-lisp/package.el @@ -543,6 +543,38 @@ Return the max version (as a string) if the package is held at a lower version." ;; Don't return nil. t)) +(defun package--list-loaded-files (dir) + "Recursively list all files in DIR which correspond to loaded features. +Returns the `file-name-sans-extension' of each file, relative to +DIR, sorted by most recently loaded last." + (let* ((history (mapcar (lambda (x) (file-name-sans-extension + (file-truename (car x)))) + load-history)) + (dir (file-truename dir)) + ;; List all files that have already been loaded. + (list-of-conflicts + (remove + nil + (mapcar + (lambda (x) (let* ((file (file-relative-name x dir)) + ;; Previously loaded file, if any. + (previous + (ignore-errors + (file-name-sans-extension + (file-truename (find-library-name file))))) + (pos (when previous (member previous history)))) + ;; Return (RELATIVE-FILENAME . HISTORY-POSITION) + (when pos + (cons (file-name-sans-extension file) (length pos))))) + (directory-files-recursively dir "\\`[^\\.].*\\.el\\'"))))) + ;; Turn the list of (FILENAME . POS) back into a list of features. Files in + ;; subdirectories are returned relative to DIR (so not actually features). + (let ((default-directory (file-name-as-directory dir))) + (mapcar (lambda (x) (file-truename (car x))) + (sort list-of-conflicts + ;; Sort the files by ascending HISTORY-POSITION. + (lambda (x y) (< (cdr x) (cdr y)))))))) + (defun package-built-in-p (package &optional min-version) "Return true if PACKAGE is built-in to Emacs. Optional arg MIN-VERSION, if non-nil, should be a version list commit 7c9eb96534274cbbe297e771c6ae764f8cd1d9ed Author: Eli Zaretskii Date: Sat Dec 13 16:26:12 2014 +0200 gnulib.mk (stddef.h): Sync with the latest change in lib/gnulib.mk. diff --git a/nt/ChangeLog b/nt/ChangeLog index 28f5fd4..1edfda0 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog @@ -1,3 +1,7 @@ +2014-12-13 Eli Zaretskii + + * gnulib.mk (stddef.h): Sync with the latest change in lib/gnulib.mk. + 2014-11-27 Oscar Fuentes * inc/ms-w32.h: Define MINGW_W64. diff --git a/nt/gnulib.mk b/nt/gnulib.mk index 4a06da5..273f522 100644 --- a/nt/gnulib.mk +++ b/nt/gnulib.mk @@ -705,6 +705,7 @@ stddef.h: stddef.in.h $(top_builddir)/config.status -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ -e 's|@''NEXT_STDDEF_H''@|$(NEXT_STDDEF_H)|g' \ + -e 's|@''HAVE_MAX_ALIGN_T''@|$(HAVE_MAX_ALIGN_T)|g' \ -e 's|@''HAVE_WCHAR_T''@|$(HAVE_WCHAR_T)|g' \ -e 's|@''REPLACE_NULL''@|$(REPLACE_NULL)|g' \ < $(srcdir)/stddef.in.h; \ commit 3c07d7f047ab27b44027c411eced863301fc6146 Author: Eric S. Raymond Date: Sat Dec 13 06:15:33 2014 -0500 Fix wrong humber arguments passed to vc-svn-diff. * vc/vc-svn.el (vc-svn-diff): Fix bug #19312. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 1ca2f22..f3d56c9 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2014-12-13 Eric S. Raymond + + * vc/vc-svn.el (vc-svn-diff): Fix bug #19312. + 2014-12-13 Michael Albinus * simple.el (password-word-equivalents): Add "passcode", used for diff --git a/lisp/vc/vc-svn.el b/lisp/vc/vc-svn.el index c36e90b..5db2676 100644 --- a/lisp/vc/vc-svn.el +++ b/lisp/vc/vc-svn.el @@ -548,7 +548,7 @@ If LIMIT is non-nil, show no more than this many entries." (if start-revision (format "-r%s" start-revision) "-rHEAD:0")) (when limit (list "--limit" (format "%s" limit))))))))) -(defun vc-svn-diff (files &optional oldvers newvers buffer) +(defun vc-svn-diff (files &optional async oldvers newvers buffer) "Get a difference report using SVN between two revisions of fileset FILES." (and oldvers (not newvers) @@ -563,12 +563,12 @@ If LIMIT is non-nil, show no more than this many entries." ;; has a different revision, we fetch the lot, which is ;; obviously sub-optimal. (setq oldvers nil)) + (setq async (and async (or oldvers newvers))) ; Svn diffs those locally. (let* ((switches (if vc-svn-diff-switches (vc-switches 'SVN 'diff) (list (concat "--diff-cmd=" diff-command) "-x" - (mapconcat 'identity (vc-switches nil 'diff) " ")))) - (async (or oldvers newvers))) ; Svn diffs those locally. + (mapconcat 'identity (vc-switches nil 'diff) " "))))) (apply 'vc-svn-command buffer (if async 'async 0) files "diff" commit a859d1cc237eca05a8db2ccde69db9da1dc9e39c Merge: c081fe2 bd6c441 Author: Andreas Schwab Date: Sat Dec 13 11:45:10 2014 +0100 Merge remote-tracking branch 'origin/emacs-24' commit bd6c441893b918122cf920a1ecdb820e3a83ec1a Author: Michael Albinus Date: Fri Dec 12 14:09:10 2014 +0100 * simple.el (password-word-equivalents): Add "passcode", used for numeric secrets like PINs or RSA tokens. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 116317b..4be07b5 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2014-12-12 Michael Albinus + + * simple.el (password-word-equivalents): Add "passcode", used for + numeric secrets like PINs or RSA tokens. + 2014-12-10 Michael Albinus * net/tramp-sh.el (tramp-get-remote-path): Use a login shell in diff --git a/lisp/simple.el b/lisp/simple.el index b8b1579..c3a8a2d 100644 --- a/lisp/simple.el +++ b/lisp/simple.el @@ -2604,7 +2604,7 @@ which is defined in the `warnings' library.\n") t)) (defcustom password-word-equivalents - '("password" "passphrase" "pass phrase" + '("password" "passcode" "passphrase" "pass phrase" ; These are sorted according to the GNU en_US locale. "" ; ko "鴻若" ; ja commit 16d4c1cdc80528ae996a27deedbd88e79bc502b2 Author: Eli Zaretskii Date: Fri Dec 12 11:19:59 2014 +0200 A better fix for bug#19346 src/gnutls.c (Fgnutls_available_p, syms_of_gnutls): Move gnutls-available-p out of the HAVE_GNUTLS conditional, and define them only once. diff --git a/src/ChangeLog b/src/ChangeLog index 9013953..f8790a6 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2014-12-12 Eli Zaretskii + + * gnutls.c (Fgnutls_available_p, syms_of_gnutls): Move + gnutls-available-p out of the HAVE_GNUTLS conditional, and define + them only once. + 2014-12-11 Teodor Zlatanov * emacs.c (main): Always include gnutls.h and run syms_of_gnutls. diff --git a/src/gnutls.c b/src/gnutls.c index d1713d3..247e5c4 100644 --- a/src/gnutls.c +++ b/src/gnutls.c @@ -1158,11 +1158,14 @@ This function may also return `gnutls-e-again', or return gnutls_make_error (ret); } +#endif /* HAVE_GNUTLS */ + DEFUN ("gnutls-available-p", Fgnutls_available_p, Sgnutls_available_p, 0, 0, 0, doc: /* Return t if GnuTLS is available in this instance of Emacs. */) (void) { -#ifdef WINDOWSNT +#ifdef HAVE_GNUTLS +# ifdef WINDOWSNT Lisp_Object found = Fassq (Qgnutls_dll, Vlibrary_cache); if (CONSP (found)) return XCDR (found); @@ -1173,14 +1176,18 @@ DEFUN ("gnutls-available-p", Fgnutls_available_p, Sgnutls_available_p, 0, 0, 0, Vlibrary_cache = Fcons (Fcons (Qgnutls_dll, status), Vlibrary_cache); return status; } -#else +# else /* !WINDOWSNT */ return Qt; -#endif +# endif /* !WINDOWSNT */ +#else /* !HAVE_GNUTLS */ + return Qnil; +#endif /* !HAVE_GNUTLS */ } void syms_of_gnutls (void) { +#ifdef HAVE_GNUTLS gnutls_global_initialized = 0; DEFSYM (Qgnutls_dll, "gnutls"); @@ -1222,7 +1229,6 @@ syms_of_gnutls (void) defsubr (&Sgnutls_boot); defsubr (&Sgnutls_deinit); defsubr (&Sgnutls_bye); - defsubr (&Sgnutls_available_p); DEFVAR_INT ("gnutls-log-level", global_gnutls_log_level, doc: /* Logging level used by the GnuTLS functions. @@ -1230,21 +1236,8 @@ Set this larger than 0 to get debug output in the *Messages* buffer. 1 is for important messages, 2 is for debug data, and higher numbers are as per the GnuTLS logging conventions. */); global_gnutls_log_level = 0; -} -#else +#endif /* HAVE_GNUTLS */ -DEFUN ("gnutls-available-p", Fgnutls_available_p, Sgnutls_available_p, 0, 0, 0, - doc: /* Return t if GnuTLS is available in this instance of Emacs. */) - (void) -{ - return Qnil; -} - -void -syms_of_gnutls (void) -{ defsubr (&Sgnutls_available_p); } - -#endif /* HAVE_GNUTLS */ commit 82ec808f0a0f4ddcf53b663c1ad7cee26814635c Author: Paul Eggert Date: Thu Dec 11 18:24:33 2014 -0800 * .gitignore: Add !lib/std*.in.h, so as to not ignore the .in.h files. diff --git a/.gitignore b/.gitignore index 260f650..3f1ac89 100644 --- a/.gitignore +++ b/.gitignore @@ -65,6 +65,7 @@ lib/inttypes.h lib/libgnu.a lib/signal.h lib/std*.h +!lib/std*.in.h lib/string.h lib/sys/ lib/time.h diff --git a/ChangeLog b/ChangeLog index a99a1b8..75b503b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,7 @@ Git ignore lib/std*.h * .gitignore: Add lib/std*.h, to ignore stdarg.h, stdbool.h, and stddef.h. Remove subsumed entries. + Add !lib/std*.in.h, so as to not ignore the .in.h files. 2014-12-11 Paul Eggert commit 3cf7629f98d1f4eadb1f097e7e6eaef43ab392ac Author: Paul Eggert Date: Thu Dec 11 18:11:46 2014 -0800 Git ignore lib/std*.h * .gitignore: Add lib/std*.h, to ignore stdarg.h, stdbool.h, and stddef.h. Remove subsumed entries. diff --git a/.gitignore b/.gitignore index 6702a19..260f650 100644 --- a/.gitignore +++ b/.gitignore @@ -64,10 +64,7 @@ lib/getopt.h lib/inttypes.h lib/libgnu.a lib/signal.h -lib/stdalign.h -lib/stdint.h -lib/stdio.h -lib/stdlib.h +lib/std*.h lib/string.h lib/sys/ lib/time.h diff --git a/ChangeLog b/ChangeLog index 39d3eae..a99a1b8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2014-12-12 Paul Eggert + + Git ignore lib/std*.h + * .gitignore: Add lib/std*.h, to ignore stdarg.h, stdbool.h, and + stddef.h. Remove subsumed entries. + 2014-12-11 Paul Eggert Port commit-msg to mawk commit 301a4014a72964a8ec0078055c273d045d94fe42 Author: Ted Zlatanov Date: Thu Dec 11 17:55:36 2014 -0500 Always define `gnutls-available-p' even if GnuTLS is not available. Fixes: debbugs:19346 * gnutls.c (Fgnutls_available_p syms_of_gnutls): Move later for clarity. Let the availability check return Qnil when the GnuTLS integration is not available, instead of erroring out. * gnutls.h: Always declare syms_of_gnutls. * emacs.c (main): Always include gnutls.h and run syms_of_gnutls. diff --git a/src/ChangeLog b/src/ChangeLog index b8663bc..9013953 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,14 @@ +2014-12-11 Teodor Zlatanov + + * emacs.c (main): Always include gnutls.h and run syms_of_gnutls. + + * gnutls.h: Always declare syms_of_gnutls. + + * gnutls.c (Fgnutls_available_p syms_of_gnutls): Move later for + clarity. Let the availability check return Qnil when the GnuTLS + integration is not available, instead of erroring out. + (Bug#19346) + 2014-12-10 Eli Zaretskii * xdisp.c (move_it_in_display_line_to, display_line): Don't diff --git a/src/emacs.c b/src/emacs.c index 4c3857e..7367e0d 100644 --- a/src/emacs.c +++ b/src/emacs.c @@ -82,9 +82,7 @@ along with GNU Emacs. If not, see . */ #include "syntax.h" #include "systime.h" -#ifdef HAVE_GNUTLS #include "gnutls.h" -#endif #if (defined PROFILING \ && (defined __FreeBSD__ || defined GNU_LINUX || defined __MINGW32__)) @@ -1502,9 +1500,7 @@ Using an Emacs configured with --with-x-toolkit=lucid does not have this problem syms_of_fontset (); #endif /* HAVE_NS */ -#ifdef HAVE_GNUTLS syms_of_gnutls (); -#endif #ifdef HAVE_GFILENOTIFY syms_of_gfilenotify (); diff --git a/src/gnutls.c b/src/gnutls.c index 03c29d0..d1713d3 100644 --- a/src/gnutls.c +++ b/src/gnutls.c @@ -673,27 +673,6 @@ See also `gnutls-init'. */) return emacs_gnutls_deinit (proc); } -DEFUN ("gnutls-available-p", Fgnutls_available_p, Sgnutls_available_p, 0, 0, 0, - doc: /* Return t if GnuTLS is available in this instance of Emacs. */) - (void) -{ -#ifdef WINDOWSNT - Lisp_Object found = Fassq (Qgnutls_dll, Vlibrary_cache); - if (CONSP (found)) - return XCDR (found); - else - { - Lisp_Object status; - status = init_gnutls_functions () ? Qt : Qnil; - Vlibrary_cache = Fcons (Fcons (Qgnutls_dll, status), Vlibrary_cache); - return status; - } -#else - return Qt; -#endif -} - - /* Initializes global GnuTLS state to defaults. Call `gnutls-global-deinit' when GnuTLS usage is no longer needed. Returns zero on success. */ @@ -1179,6 +1158,26 @@ This function may also return `gnutls-e-again', or return gnutls_make_error (ret); } +DEFUN ("gnutls-available-p", Fgnutls_available_p, Sgnutls_available_p, 0, 0, 0, + doc: /* Return t if GnuTLS is available in this instance of Emacs. */) + (void) +{ +#ifdef WINDOWSNT + Lisp_Object found = Fassq (Qgnutls_dll, Vlibrary_cache); + if (CONSP (found)) + return XCDR (found); + else + { + Lisp_Object status; + status = init_gnutls_functions () ? Qt : Qnil; + Vlibrary_cache = Fcons (Fcons (Qgnutls_dll, status), Vlibrary_cache); + return status; + } +#else + return Qt; +#endif +} + void syms_of_gnutls (void) { @@ -1233,4 +1232,19 @@ are as per the GnuTLS logging conventions. */); global_gnutls_log_level = 0; } +#else + +DEFUN ("gnutls-available-p", Fgnutls_available_p, Sgnutls_available_p, 0, 0, 0, + doc: /* Return t if GnuTLS is available in this instance of Emacs. */) + (void) +{ + return Qnil; +} + +void +syms_of_gnutls (void) +{ + defsubr (&Sgnutls_available_p); +} + #endif /* HAVE_GNUTLS */ diff --git a/src/gnutls.h b/src/gnutls.h index 8a667c0..8a18976 100644 --- a/src/gnutls.h +++ b/src/gnutls.h @@ -82,8 +82,8 @@ extern void emacs_gnutls_transport_set_errno (gnutls_session_t state, int err); #endif extern Lisp_Object emacs_gnutls_deinit (Lisp_Object); -extern void syms_of_gnutls (void); - #endif +extern void syms_of_gnutls (void); + #endif commit d76b9b2a213fa4e2c812a2c2503b4bfa4c28ece8 Author: Eli Zaretskii Date: Thu Dec 11 20:27:00 2014 +0200 Don't break example string between 2 lines (bug#19257) doc/lispref/text.texi (Comparing Text): Prevent a text string from being broken between 2 lines by using @w{}. diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index 9f8461c..dcab3ba 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -1,3 +1,8 @@ +2014-12-11 Eli Zaretskii + + * text.texi (Comparing Text): Prevent a text string from being + broken between 2 lines. (Bug#19257) + 2014-11-19 Paul Eggert Lessen focus on ChangeLog files, as opposed to change log entries. diff --git a/doc/lispref/text.texi b/doc/lispref/text.texi index 6665cc3..09dec56 100644 --- a/doc/lispref/text.texi +++ b/doc/lispref/text.texi @@ -343,10 +343,10 @@ This function ignores case when comparing characters if @code{case-fold-search} is non-@code{nil}. It always ignores text properties. -Suppose the current buffer contains the text @samp{foobarbar -haha!rara!}; then in this example the two substrings are @samp{rbar } -and @samp{rara!}. The value is 2 because the first substring is greater -at the second character. +Suppose you have the text @w{@samp{foobarbar haha!rara!}} in the +current buffer; then in this example the two substrings are @samp{rbar +} and @samp{rara!}. The value is 2 because the first substring is +greater at the second character. @example (compare-buffer-substrings nil 6 11 nil 16 21) commit 75b4857ef040863b4d53ea2a27993fdd8370f7af Author: Paul Eggert Date: Wed Dec 10 23:17:04 2014 -0800 Port commit-msg to mawk Problem reported by Ted Zlatanov in: http://lists.gnu.org/archive/html/emacs-devel/2014-12/msg01093.html * build-aux/git-hooks/commit-msg (space, non_space, non_print): New vars. Use them as approximations to POSIX bracket expressions, on implementations like mawk that do not support POSIX regexps. diff --git a/ChangeLog b/ChangeLog index d4a4f28..39d3eae 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2014-12-11 Paul Eggert + Port commit-msg to mawk + Problem reported by Ted Zlatanov in: + http://lists.gnu.org/archive/html/emacs-devel/2014-12/msg01093.html + * build-aux/git-hooks/commit-msg (space, non_space, non_print): + New vars. Use them as approximations to POSIX bracket expressions, + on implementations like mawk that do not support POSIX regexps. + Improve commit-msg messages and autosquash Problem reported by Michal Nazarewicz in Bug#19337. * build-aux/git-hooks/commit-msg: Add "commit message" to diff --git a/build-aux/git-hooks/commit-msg b/build-aux/git-hooks/commit-msg index d2a0c59..5eb994c 100755 --- a/build-aux/git-hooks/commit-msg +++ b/build-aux/git-hooks/commit-msg @@ -46,6 +46,20 @@ fi # Check the log entry. exec $awk ' + BEGIN { + if (" " ~ /[[:space:]]/) { + space = "[[:space:]]" + non_space = "[^[:space:]]" + non_print = "[^[:print:]]" + } else { + # mawk 1.3.3 does not support POSIX bracket expressions. + # Approximate them as best we can. + space = "[ \f\n\r\t\v]" + non_space = "[^ \f\n\r\t\v]" + non_print = "[\1-\37\177]" + } + } + /^#/ { next } !/^.*$/ { @@ -53,7 +67,7 @@ exec $awk ' status = 1 } - nlines == 0 && !/[^[:space:]]/ { next } + nlines == 0 && $0 !~ non_space { next } { nlines++ } @@ -62,18 +76,18 @@ exec $awk ' if (! sub(/^fixup! /, "")) sub(/^squash! /, "") - if (/^[[:space:]]/) { + if ($0 ~ "^" space) { print "White space at start of commit message'\''s first line" status = 1 } } - nlines == 2 && /[^[:space:]]/ { + nlines == 2 && $0 ~ non_space { print "Nonempty second line in commit message" status = 1 } - 72 < length && /[[:space:]]/ { + 72 < length && $0 ~ space { print "Line longer than 72 characters in commit message" status = 1 } @@ -88,11 +102,11 @@ exec $awk ' status = 1 } - /[^[:print:]]/ { + $0 ~ non_print { if (gsub(/\t/, "")) { print "Tab in commit message; please use spaces instead" } - if (/[^[:print:]]/) { + if ($0 ~ non_print) { print "Unprintable character in commit message" } status = 1 commit 9ac033203005ba53c4f1e65fcb44ae95edf1b402 Author: Paul Eggert Date: Wed Dec 10 20:44:35 2014 -0800 Improve commit-msg messages and autosquash Problem reported by Michal Nazarewicz in Bug#19337. * build-aux/git-hooks/commit-msg: Add "commit message" to diagnostics. Distinguish better between tabs and other unprintable chars in diagnostics. Don't complain if a prefix "fixup! " or "squash! " makes a summary line too long. diff --git a/ChangeLog b/ChangeLog index 4a7b590..d4a4f28 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2014-12-11 Paul Eggert + + Improve commit-msg messages and autosquash + Problem reported by Michal Nazarewicz in Bug#19337. + * build-aux/git-hooks/commit-msg: Add "commit message" to + diagnostics. Distinguish better between tabs and other + unprintable chars in diagnostics. Don't complain if a prefix + "fixup! " or "squash! " makes a summary line too long. + 2014-12-08 Paul Eggert Port commit-message checking to FreeBSD 9. diff --git a/build-aux/git-hooks/commit-msg b/build-aux/git-hooks/commit-msg index f407881..d2a0c59 100755 --- a/build-aux/git-hooks/commit-msg +++ b/build-aux/git-hooks/commit-msg @@ -49,7 +49,7 @@ exec $awk ' /^#/ { next } !/^.*$/ { - print "Invalid character (not UTF-8)" + print "Invalid character (not UTF-8) in commit message" status = 1 } @@ -57,39 +57,50 @@ exec $awk ' { nlines++ } - nlines == 1 && /^[[:space:]]/ { - print "White space at start of first line" - status = 1 - } + nlines == 1 { + # Ignore special markers used by "git rebase --autosquash". + if (! sub(/^fixup! /, "")) + sub(/^squash! /, "") - nlines == 2 && /[^[:space:]]/ { - print "Nonempty second line" - status = 1 + if (/^[[:space:]]/) { + print "White space at start of commit message'\''s first line" + status = 1 + } } - /[^[:print:]]/ { - print "Unprintable character; please use spaces instead of tabs" + nlines == 2 && /[^[:space:]]/ { + print "Nonempty second line in commit message" status = 1 } 72 < length && /[[:space:]]/ { - print "Line longer than 72 characters" + print "Line longer than 72 characters in commit message" status = 1 } 140 < length { - print "Word longer than 140 characters" + print "Word longer than 140 characters in commit message" status = 1 } /^Signed-off-by: / { - print "'\''Signed-off-by:'\'' present" + print "'\''Signed-off-by:'\'' in commit message" + status = 1 + } + + /[^[:print:]]/ { + if (gsub(/\t/, "")) { + print "Tab in commit message; please use spaces instead" + } + if (/[^[:print:]]/) { + print "Unprintable character in commit message" + } status = 1 } END { if (nlines == 0) { - print "Empty change log entry" + print "Empty commit message" status = 1 } exit status commit 0c2f254bc3d69ba08a59037e8e192d5d7fb7d816 Author: Eli Zaretskii Date: Wed Dec 10 19:54:19 2014 +0200 Support overflow-newline-into-fringe together with word-wrap (bug#19300) src/xdisp.c (move_it_in_display_line_to, display_line): Don't disallow overflow-newline-into-fringe when word-wrap is in effect. diff --git a/src/ChangeLog b/src/ChangeLog index 0a8acf9..b8663bc 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2014-12-10 Eli Zaretskii + + * xdisp.c (move_it_in_display_line_to, display_line): Don't + disallow overflow-newline-into-fringe when word-wrap is in + effect. (Bug#19300) + 2014-12-04 Lee Duhem (tiny change) * eval.c (Fsignal): Remove duplicate test. diff --git a/src/xdisp.c b/src/xdisp.c index bd26281..e3e0035 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -8792,12 +8792,7 @@ move_it_in_display_line_to (struct it *it, doesn't fit on the line, e.g. a wide image. */ it->hpos == 0 || (new_x == it->last_visible_x - && FRAME_WINDOW_P (it->f) - /* When word-wrap is ON and we have a valid - wrap point, we don't allow the last glyph - to "just barely fit" on the line. */ - && (it->line_wrap != WORD_WRAP - || wrap_it.sp < 0))) + && FRAME_WINDOW_P (it->f))) { ++it->hpos; it->current_x = new_x; @@ -8864,7 +8859,8 @@ move_it_in_display_line_to (struct it *it, } if (ITERATOR_AT_END_OF_LINE_P (it) && (it->line_wrap != WORD_WRAP - || wrap_it.sp < 0)) + || wrap_it.sp < 0 + || IT_OVERFLOW_NEWLINE_INTO_FRINGE (it))) { result = MOVE_NEWLINE_OR_CR; break; @@ -20389,7 +20385,8 @@ display_line (struct it *it) { /* If line-wrap is on, check if a previous wrap point was found. */ - if (wrap_row_used > 0 + if (!IT_OVERFLOW_NEWLINE_INTO_FRINGE (it) + && wrap_row_used > 0 /* Even if there is a previous wrap point, continue the line here as usual, if (i) the previous character @@ -20419,6 +20416,18 @@ display_line (struct it *it) row->continued_p = 0; row->exact_window_width_line_p = 1; } + /* If line-wrap is on, check if a + previous wrap point was found. */ + else if (wrap_row_used > 0 + /* Even if there is a previous wrap + point, continue the line here as + usual, if (i) the previous character + was a space or tab AND (ii) the + current character is not. */ + && (!may_wrap + || IT_DISPLAYING_WHITESPACE (it))) + goto back_to_wrap; + } } else if (it->bidi_p) commit 935ee05f07019d0dc1ccf304317a6790767f5a20 Author: Michael Albinus Date: Wed Dec 10 14:15:51 2014 +0100 * net/tramp-sh.el (tramp-get-remote-path): Use a login shell in order to determine `tramp-own-remote-path'. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index d946a2e..116317b 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2014-12-10 Michael Albinus + + * net/tramp-sh.el (tramp-get-remote-path): Use a login shell in + order to determine `tramp-own-remote-path'. + 2014-12-09 Fabi叩n Ezequiel Gallina * progmodes/python.el (python-shell-parse-command): Quote diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el index ff00b55..f94c5b5 100644 --- a/lisp/net/tramp-sh.el +++ b/lisp/net/tramp-sh.el @@ -3847,6 +3847,18 @@ file exists and nonzero exit status otherwise." (setq item (pop alist)) (when (string-match (car item) shell) (setq extra-args (cdr item)))) + ;; It is useful to set the prompt in the following command + ;; because some people have a setting for $PS1 which /bin/sh + ;; doesn't know about and thus /bin/sh will display a strange + ;; prompt. For example, if $PS1 has "${CWD}" in the value, then + ;; ksh will display the current working directory but /bin/sh + ;; will display a dollar sign. The following command line sets + ;; $PS1 to a sane value, and works under Bourne-ish shells as + ;; well as csh-like shells. We also unset the variable $ENV + ;; because that is read by some sh implementations (eg, bash + ;; when called as sh) on startup; this way, we avoid the startup + ;; file clobbering $PS1. $PROMPT_COMMAND is another way to set + ;; the prompt in /bin/bash, it must be discarded as well. (tramp-send-command vec (format "exec env ENV='' HISTFILE=/dev/null PROMPT_COMMAND='' PS1=%s PS2='' PS3='' %s %s" @@ -3923,20 +3935,6 @@ seconds. If not, it produces an error message with the given ERROR-ARGS." Mainly sets the prompt and the echo correctly. PROC is the shell process to set up. VEC specifies the connection." (let ((tramp-end-of-output tramp-initial-end-of-output)) - ;; It is useful to set the prompt in the following command because - ;; some people have a setting for $PS1 which /bin/sh doesn't know - ;; about and thus /bin/sh will display a strange prompt. For - ;; example, if $PS1 has "${CWD}" in the value, then ksh will - ;; display the current working directory but /bin/sh will display - ;; a dollar sign. The following command line sets $PS1 to a sane - ;; value, and works under Bourne-ish shells as well as csh-like - ;; shells. Daniel Pittman reports that the unusual positioning of - ;; the single quotes makes it work under `rc', too. We also unset - ;; the variable $ENV because that is read by some sh - ;; implementations (eg, bash when called as sh) on startup; this - ;; way, we avoid the startup file clobbering $PS1. $PROMPT_COMMAND - ;; is another way to set the prompt in /bin/bash, it must be - ;; discarded as well. (tramp-open-shell vec (or (tramp-get-connection-property vec "remote-shell" nil) @@ -5025,13 +5023,25 @@ Return ATTR." "/bin:/usr/bin") "/bin:/usr/bin")))) (own-remote-path - (when elt2 - (condition-case nil - (tramp-send-command-and-read vec "echo \\\"$PATH\\\"") - (error - (tramp-message - vec 3 "$PATH not set, ignoring `tramp-own-remote-path'.") - nil))))) + ;; We cannot apply `tramp-send-command-and-read' because + ;; the login shell could return more than just the $PATH + ;; string. So we emulate that function. + (when elt2 + (tramp-send-command + vec + (format + "%s -l %s 'echo \\\"$PATH\\\"'" + (tramp-get-method-parameter + (tramp-file-name-method vec) 'tramp-remote-shell) + (mapconcat + 'identity + (tramp-get-method-parameter + (tramp-file-name-method vec) 'tramp-remote-shell-args) + " "))) + (with-current-buffer (tramp-get-connection-buffer vec) + (goto-char (point-max)) + (forward-line -1) + (read (current-buffer)))))) ;; Replace place holder `tramp-default-remote-path'. (when elt1 commit c2db9393595559ccddcccbb8d1a85e1167867714 Author: Fabi叩n Ezequiel Gallina Date: Mon Dec 8 22:32:53 2014 -0300 python.el: Support interpreter paths with spaces Fixes: debbugs:19289 * lisp/progmodes/python.el (python-shell-parse-command): Quote `python-shell-interpreter`. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 26b09a6..d946a2e 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2014-12-09 Fabi叩n Ezequiel Gallina + + * progmodes/python.el (python-shell-parse-command): Quote + `python-shell-interpreter`. (Bug#19289) + 2014-12-04 Stefan Monnier * progmodes/sh-script.el (sh-smie-sh-rules): Go back to the beginning diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index 521f0b5..357ca5b 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el @@ -2086,7 +2086,8 @@ uniqueness for different types of configurations." (exec-path (python-shell-calculate-exec-path))) (format "%s %s" ;; FIXME: Why executable-find? - (executable-find python-shell-interpreter) + (shell-quote-argument + (executable-find python-shell-interpreter)) python-shell-interpreter-args))) (defun python-shell-calculate-process-environment () commit d83f3299095c52ffb5bb01e30c41c6e1077dee81 Author: Glenn Morris Date: Mon Dec 8 08:53:04 2014 -0800 ChangeLog fix diff --git a/ChangeLog b/ChangeLog index 3686a68..4a7b590 100644 --- a/ChangeLog +++ b/ChangeLog @@ -120,8 +120,7 @@ 2014-11-13 Lars Magne Ingebrigtsen * .gitignore: Copy over sufficient ignorable files from the old - .bzrignore that a simple build doesn't list lots of unregistered - files. + .bzrignore that a simple build doesn't list lots of unregistered files. 2014-11-11 Eric S. Raymond @@ -129,16 +128,15 @@ All bzr revision IDS, and all CVS revision IDs for which a commit could be identified, were changed to time-date!committer version - stamps. All .cvsignore files in the history became .gitignore - files. Fixes-bug annotations from bzr were copied into the + stamps. All .cvsignore files in the history became .gitignore + files. Fixes-bug annotations from bzr were copied into the corresponding commit comments. (The first .cvsignore commit was 1999-09-30T14:07:54Z!fx@gnu.org. The last CVS commit was 2009-12-27T08:11:12Z!cyd@stupidchicken.com.) Committer/author email addresses are generally correct for the - transition day, not necessarily when the comit was originally - made. + transition day, not necessarily when the commit was originally made. 2014-11-05 Glenn Morris commit 0f9fbb922cb029b0c36805d260a5db28e25d3dd1 Author: Paul Eggert Date: Sun Dec 7 16:17:20 2014 -0800 Port commit-message checking to FreeBSD 9. This fixes a bug reported by Jan Dj辰rv in: http://lists.gnu.org/archive/html/emacs-devel/2014-12/msg00704.html along with some other issues I noticed while testing with FreeBSD. * build-aux/git-hooks/commit-msg: Prefer gawk if available. Prefer en_US.UTF-8 to en_US.utf8, as it's more portable. Work around bug in FreeBSD 9 awk, where /[[:cntrl:]]/ matches ordinary text characters. Be less tricky about quoting "'" in a shell script. diff --git a/ChangeLog b/ChangeLog index d7fcd25..3686a68 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2014-12-08 Paul Eggert + + Port commit-message checking to FreeBSD 9. + This fixes a bug reported by Jan Dj辰rv in: + http://lists.gnu.org/archive/html/emacs-devel/2014-12/msg00704.html + along with some other issues I noticed while testing with FreeBSD. + * build-aux/git-hooks/commit-msg: Prefer gawk if available. + Prefer en_US.UTF-8 to en_US.utf8, as it's more portable. + Work around bug in FreeBSD 9 awk, where /[[:cntrl:]]/ matches + ordinary text characters. + Be less tricky about quoting "'" in a shell script. + 2014-12-05 Stefan Monnier * .gitignore: Ignore autosave files. diff --git a/build-aux/git-hooks/commit-msg b/build-aux/git-hooks/commit-msg index 6a09edd..f407881 100755 --- a/build-aux/git-hooks/commit-msg +++ b/build-aux/git-hooks/commit-msg @@ -20,25 +20,32 @@ # Written by Paul Eggert. +# Prefer gawk if available, as it handles NUL bytes properly. +if type gawk >/dev/null 2>&1; then + awk=gawk +else + awk=awk +fi + # Use a UTF-8 locale if available, so that the UTF-8 check works. # Use U+00A2 CENT SIGN to test whether the locale works. cent_sign_utf8_octal='\302\242' at_sign=` printf "${cent_sign_utf8_octal}@" | - awk '{print substr($0, 2)}' 2>/dev/null + $awk '{print substr($0, 2)}' 2>/dev/null ` if test "$at_sign" != @; then at_sign=` printf "${cent_sign_utf8_octal}@" | - LC_ALL=en_US.utf8 awk '{print substr($0, 2)}' 2>/dev/null + LC_ALL=en_US.UTF-8 $awk '{print substr($0, 2)}' 2>/dev/null ` if test "$at_sign" = @; then - LC_ALL=en_US.utf8; export LC_ALL + LC_ALL=en_US.UTF-8; export LC_ALL fi fi # Check the log entry. -exec awk ' +exec $awk ' /^#/ { next } !/^.*$/ { @@ -60,8 +67,8 @@ exec awk ' status = 1 } - /[[:cntrl:]]/ { - print "Text contains control character; please use spaces instead of tabs" + /[^[:print:]]/ { + print "Unprintable character; please use spaces instead of tabs" status = 1 } @@ -76,7 +83,7 @@ exec awk ' } /^Signed-off-by: / { - print "'Signed-off-by:' present" + print "'\''Signed-off-by:'\'' present" status = 1 } commit 3db1adacc654f33ee8d5c515214c9d5325ee7fc1 Author: Eli Zaretskii Date: Sat Dec 6 21:52:00 2014 +0200 admin/MAINTAINERS: Update my interests and responsibilities. diff --git a/admin/MAINTAINERS b/admin/MAINTAINERS index efcc630..1a5c641 100644 --- a/admin/MAINTAINERS +++ b/admin/MAINTAINERS @@ -31,6 +31,7 @@ Eli Zaretskii src/msdos.[ch] src/dosfns.[ch] src/w16select.c + src/unexcoff.c lisp/term/internal.el lisp/term/pc-win.el lisp/dos-fns.el @@ -80,14 +81,18 @@ Bastien Guerry Eli Zaretskii doc/* lispref/* - info/dir src/xfaces.c src/xdisp.c src/term.c src/dispnew.c + src/dispextern.h src/frame.c src/dired.c + src/unexw32.c + src/w32*.[ch] + src/window.c + nt/* lisp/arc-mode.el lisp/menu-bar.el @@ -97,6 +102,8 @@ Eli Zaretskii lisp/startup.el lisp/w32*.el + admin/unidata/* + Stefan Monnier src/intervals.c src/keyboard.c @@ -181,24 +188,10 @@ src/tparam.c src/undo.c src/unexaix.c src/unexalpha.c -src/unexcoff.c src/unexelf.c src/unexhp9k800.c -src/unexw32.c src/vm-limit.c -src/w32.c -src/w32console.c -src/w32fns.c -src/w32heap.c -src/w32inevt.c -src/w32menu.c -src/w32proc.c -src/w32reg.c -src/w32select.c -src/w32term.c -src/w32xfns.c src/widget.c -src/window.c src/xfns.c src/xmenu.c src/xrdb.c commit 6382f2411efaf8df31381cc82cf2cfff227a9b0f Author: Stefan Monnier Date: Fri Dec 5 15:31:28 2014 -0500 * .gitignore: Ignore autosave files. diff --git a/.gitignore b/.gitignore index d40f09a..6702a19 100644 --- a/.gitignore +++ b/.gitignore @@ -233,6 +233,7 @@ info/dir *.rej *~ .#* +\#*\# [0-9]*.patch # Built by 'make install'. diff --git a/ChangeLog b/ChangeLog index c70503c..d7fcd25 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2014-12-05 Stefan Monnier + + * .gitignore: Ignore autosave files. + 2014-12-01 Paul Eggert * .gitignore: Remove redundant pattern (subsumed by _*).