Mercurial > emacs
changeset 109932:fa7a6dee64ce
merge emacs-23
| author | Kenichi Handa <handa@etlken> |
|---|---|
| date | Wed, 18 Aug 2010 17:03:46 +0900 |
| parents | 1ae553f27229 (current diff) f985155316b2 (diff) |
| children | b6b4bb484cc3 |
| files | |
| diffstat | 13 files changed, 104 insertions(+), 41 deletions(-) [+] |
line wrap: on
line diff
--- a/leim/ChangeLog Fri Aug 13 15:35:36 2010 +0900 +++ b/leim/ChangeLog Wed Aug 18 17:03:46 2010 +0900 @@ -1,3 +1,17 @@ +2010-08-15 Andreas Schwab <schwab@linux-m68k.org> + + * quail/vntelex.el ("vietnamese-telex"): Doc fix. + + * quail/georgian.el: Remove extra backslashes. + +2010-08-14 Andreas Schwab <schwab@linux-m68k.org> + + * quail/arabic.el: Quote [ and ]. + * quail/latin-ltx.el: Likewise. + + * quail/greek.el ("greek", "greek-postfix"): Change string to + character. + 2010-08-13 Kenichi Handa <handa@m17n.org> * quail/greek.el ("greek-postfix"): Add rules for Greek style
--- a/leim/quail/arabic.el Fri Aug 13 15:35:36 2010 +0900 +++ b/leim/quail/arabic.el Wed Aug 18 17:03:46 2010 +0900 @@ -57,8 +57,8 @@ ("A" ?ِ) ("S" ?ٍ) - ("D" ?]) - ("F" ?[) + ("D" ?\]) + ("F" ?\[) ("G" ["لأ"]) ("H" ?أ) ("J" ?ـ)
--- a/leim/quail/georgian.el Fri Aug 13 15:35:36 2010 +0900 +++ b/leim/quail/georgian.el Wed Aug 18 17:03:46 2010 +0900 @@ -51,7 +51,7 @@ ("n" ?ნ) ("o" ?ო) (".p" ?პ) - ("\+z" ?ჟ) + ("+z" ?ჟ) ("r" ?რ) ("s" ?ს) (".t" ?ტ) @@ -60,14 +60,14 @@ ("k" ?ქ) (".g" ?ღ) ("q" ?ყ) - ("\+s" ?შ) - ("\+c" ?ჩ) + ("+s" ?შ) + ("+c" ?ჩ) ("c" ?ც) ("j" ?ძ) (".c" ?წ) - (".\+c" ?ჭ) + (".+c" ?ჭ) ("x" ?ხ) - ("\+j" ?ჯ) + ("+j" ?ჯ) ("h" ?ჰ) ("q1" ?ჴ) ("e0" ?ჱ)
--- a/leim/quail/greek.el Fri Aug 13 15:35:36 2010 +0900 +++ b/leim/quail/greek.el Wed Aug 18 17:03:46 2010 +0900 @@ -1280,8 +1280,8 @@ (":;i" ?,F@(B) (";:y" ?,F`(B) (":;y" ?,F`(B) - (";<" "$(Q)((B") - (";>" "$(Q)2(B")) + (";<" ?$(Q)((B) + (";>" ?$(Q)2(B)) (quail-define-package "greek-postfix" "GreekPost" ",FX(B" nil @@ -1422,11 +1422,11 @@ ("i;:" ?,F@(B) ("y:;" ?,F`(B) ("y;:" ?,F`(B) - ;; There two are asymmetric with ";<" and ";>" in "greek" input - ;; method. But, as the other Latin postfix methdos adopt "<<" and + ;; These two are asymmetric with ";<" and ";>" in "greek" input + ;; method. But, as the other Latin postfix methods adopt "<<" and ;; ">>", it may be better to follow them. - ("<<" "$(Q)((B") - (">>" "$(Q)2(B")) + ("<<" ?$(Q)((B) + (">>" ?$(Q)2(B)) ;; arch-tag: 2a37e042-db1b-4ecf-b755-117775a3c150
--- a/leim/quail/latin-ltx.el Fri Aug 13 15:35:36 2010 +0900 +++ b/leim/quail/latin-ltx.el Wed Aug 18 17:03:46 2010 +0900 @@ -653,7 +653,7 @@ ("\\lambda" ?λ) ("\\langle" ?〈) ("\\lbrace" ?{) - ("\\lbrack" ?[) + ("\\lbrack" ?\[) ("\\lceil" ?⌈) ("\\ldots" ?…) ("\\le" ?≤) @@ -788,7 +788,7 @@ ("\\quad" ? ) ("\\rangle" ?〉) ("\\rbrace" ?}) - ("\\rbrack" ?]) + ("\\rbrack" ?\]) ("\\rceil" ?⌉) ("\\rfloor" ?⌋) ("\\rightarrow" ?→)
--- a/leim/quail/vntelex.el Fri Aug 13 15:35:36 2010 +0900 +++ b/leim/quail/vntelex.el Wed Aug 18 17:03:46 2010 +0900 @@ -53,7 +53,7 @@ acute s as -> ,1a(B grave f af -> ,1`(B hook above r ar -> ,1d(B - tilde x ax -> ,1c(B + tilde x ax -> ,1c(B dot below j aj -> ,1U(B d bar dd -> ,1p(B
--- a/lisp/ChangeLog Fri Aug 13 15:35:36 2010 +0900 +++ b/lisp/ChangeLog Wed Aug 18 17:03:46 2010 +0900 @@ -1,3 +1,16 @@ +2010-08-18 Glenn Morris <rgm@gnu.org> + + * woman.el (woman-translate): Case matters. (Bug#6849) + +2010-08-14 Chong Yidong <cyd@stupidchicken.com> + + * simple.el (kill-region): Doc fix (Bug#6787). + +2010-08-14 Glenn Morris <rgm@gnu.org> + + * calendar/diary-lib.el (diary-header-line-format): + Fit it to the window, not the frame. + 2010-08-11 Andreas Schwab <schwab@linux-m68k.org> * subr.el (ignore-errors): Add debug declaration.
--- a/lisp/calendar/diary-lib.el Fri Aug 13 15:35:36 2010 +0900 +++ b/lisp/calendar/diary-lib.el Wed Aug 18 17:03:46 2010 +0900 @@ -383,14 +383,14 @@ "Some text is hidden - press \"s\" in calendar \ before edit/copy" "Diary")) - ?\s (frame-width))) + ?\s (window-width))) "Format of the header line displayed by `diary-simple-display'. Only used if `diary-header-line-flag' is non-nil." :group 'diary :type 'sexp :initialize 'custom-initialize-default :set 'diary-set-header - :version "22.1") + :version "23.3") ; frame-width -> window-width ;; The first version of this also checked for diary-selective-display ;; in the non-fancy case. This was an attempt to distinguish between
--- a/lisp/simple.el Fri Aug 13 15:35:36 2010 +0900 +++ b/lisp/simple.el Wed Aug 18 17:03:46 2010 +0900 @@ -2959,7 +2959,8 @@ the text, but put the text in the kill ring anyway. This means that you can use the killing commands to copy text from a read-only buffer. -This is the primitive for programs to kill text (as opposed to deleting it). +Lisp programs should use this function for killing text. + (To delete text, use `delete-region'.) Supply two arguments, character positions indicating the stretch of text to be killed. Any command that calls this function is a \"kill command\".
--- a/lisp/woman.el Fri Aug 13 15:35:36 2010 +0900 +++ b/lisp/woman.el Wed Aug 18 17:03:46 2010 +0900 @@ -3384,7 +3384,10 @@ "Translate up to marker TO. Do this last of all transformations." (if translations (let ((matches (car translations)) - (alist (cdr translations))) + (alist (cdr translations)) + ;; Translations are case-sensitive, eg ".tr ab" does not + ;; affect "A" (bug#6849). + (case-fold-search nil)) (while (re-search-forward matches to t) ;; Done like this to retain text properties and ;; support translation of special characters:
--- a/src/ChangeLog Fri Aug 13 15:35:36 2010 +0900 +++ b/src/ChangeLog Wed Aug 18 17:03:46 2010 +0900 @@ -1,3 +1,22 @@ +2010-08-17 Andreas Schwab <schwab@linux-m68k.org> + + * eval.c (Flet, Feval, Fapply, apply_lambda): Use SAFE_ALLOCA_LISP + instead of SAFE_ALLOCA. + +2010-08-17 Chong Yidong <cyd@stupidchicken.com> + + * eval.c (Flet, Feval, Fapply, apply_lambda): Use SAFE_ALLOCA + (Bug#6214). + +2010-08-14 Jan Djärv <jan.h.d@swipnet.se> + + * doc.c (Fsnarf_documentation): Set skip_file only if p[1] is S. + +2010-08-13 Jan Djärv <jan.h.d@swipnet.se> + + * doc.c (Fsnarf_documentation): Initialize skip_file before + build-files test. + 2010-08-09 Peter O'Gorman <pogma@thewrittenword.com> (tiny change) * s/hpux10-20.h (HAVE_TERMIOS, NO_TERMIO, ORDINARY_LINK): New
--- a/src/doc.c Fri Aug 13 15:35:36 2010 +0900 +++ b/src/doc.c Wed Aug 18 17:03:46 2010 +0900 @@ -640,24 +640,28 @@ p = buf; end = buf + (filled < 512 ? filled : filled - 128); while (p != end && *p != '\037') p++; - /* p points to ^_Ffunctionname\n or ^_Vvarname\n. */ + /* p points to ^_Ffunctionname\n or ^_Vvarname\n or ^_Sfilename\n. */ if (p != end) { end = (char *) index (p, '\n'); /* See if this is a file name, and if it is a file in build-files. */ - if (p[1] == 'S' && end - p > 4 && end[-2] == '.' - && (end[-1] == 'o' || end[-1] == 'c')) + if (p[1] == 'S') { - int len = end - p - 2; - char *fromfile = alloca (len + 1); - strncpy (fromfile, &p[2], len); - fromfile[len] = 0; - if (fromfile[len-1] == 'c') - fromfile[len-1] = 'o'; + skip_file = 0; + if (end - p > 4 && end[-2] == '.' + && (end[-1] == 'o' || end[-1] == 'c')) + { + int len = end - p - 2; + char *fromfile = alloca (len + 1); + strncpy (fromfile, &p[2], len); + fromfile[len] = 0; + if (fromfile[len-1] == 'c') + fromfile[len-1] = 'o'; - skip_file = NILP (Fmember (build_string (fromfile), - Vbuild_files)); + skip_file = NILP (Fmember (build_string (fromfile), + Vbuild_files)); + } } sym = oblookup (Vobarray, p + 2,
--- a/src/eval.c Fri Aug 13 15:35:36 2010 +0900 +++ b/src/eval.c Wed Aug 18 17:03:46 2010 +0900 @@ -1028,12 +1028,13 @@ int count = SPECPDL_INDEX (); register int argnum; struct gcpro gcpro1, gcpro2; + USE_SAFE_ALLOCA; varlist = Fcar (args); /* Make space to hold the values to give the bound variables */ elt = Flength (varlist); - temps = (Lisp_Object *) alloca (XFASTINT (elt) * sizeof (Lisp_Object)); + SAFE_ALLOCA_LISP (temps, XFASTINT (elt)); /* Compute the values and store them in `temps' */ @@ -1066,6 +1067,7 @@ } elt = Fprogn (Fcdr (args)); + SAFE_FREE (); return unbind_to (count, elt); } @@ -2299,8 +2301,9 @@ /* Pass a vector of evaluated arguments */ Lisp_Object *vals; register int argnum = 0; - - vals = (Lisp_Object *) alloca (XINT (numargs) * sizeof (Lisp_Object)); + USE_SAFE_ALLOCA; + + SAFE_ALLOCA_LISP (vals, XINT (numargs)); GCPRO3 (args_left, fun, fun); gcpro3.var = vals; @@ -2318,6 +2321,7 @@ val = (*XSUBR (fun)->function) (XINT (numargs), vals); UNGCPRO; + SAFE_FREE (); goto done; } @@ -2430,8 +2434,9 @@ register int i, numargs; register Lisp_Object spread_arg; register Lisp_Object *funcall_args; - Lisp_Object fun; + Lisp_Object fun, retval; struct gcpro gcpro1; + USE_SAFE_ALLOCA; fun = args [0]; funcall_args = 0; @@ -2470,8 +2475,7 @@ { /* Avoid making funcall cons up a yet another new vector of arguments by explicitly supplying nil's for optional values */ - funcall_args = (Lisp_Object *) alloca ((1 + XSUBR (fun)->max_args) - * sizeof (Lisp_Object)); + SAFE_ALLOCA_LISP (funcall_args, 1 + XSUBR (fun)->max_args); for (i = numargs; i < XSUBR (fun)->max_args;) funcall_args[++i] = Qnil; GCPRO1 (*funcall_args); @@ -2483,8 +2487,7 @@ function itself as well as its arguments. */ if (!funcall_args) { - funcall_args = (Lisp_Object *) alloca ((1 + numargs) - * sizeof (Lisp_Object)); + SAFE_ALLOCA_LISP (funcall_args, 1 + numargs); GCPRO1 (*funcall_args); gcpro1.nvars = 1 + numargs; } @@ -2500,7 +2503,11 @@ } /* By convention, the caller needs to gcpro Ffuncall's args. */ - RETURN_UNGCPRO (Ffuncall (gcpro1.nvars, funcall_args)); + retval = Ffuncall (gcpro1.nvars, funcall_args); + UNGCPRO; + SAFE_FREE (); + + return retval; } /* Run hook variables in various ways. */ @@ -3108,9 +3115,10 @@ struct gcpro gcpro1, gcpro2, gcpro3; register int i; register Lisp_Object tem; + USE_SAFE_ALLOCA; numargs = Flength (args); - arg_vector = (Lisp_Object *) alloca (XINT (numargs) * sizeof (Lisp_Object)); + SAFE_ALLOCA_LISP (arg_vector, XINT (numargs)); args_left = args; GCPRO3 (*arg_vector, args_left, fun); @@ -3139,6 +3147,7 @@ tem = call_debugger (Fcons (Qexit, Fcons (tem, Qnil))); /* Don't do it again when we return to eval. */ backtrace_list->debug_on_exit = 0; + SAFE_FREE (); return tem; }