Now on revision 106684. ------------------------------------------------------------ revno: 106684 committer: Sam Steingold branch nick: trunk timestamp: Thu 2011-12-15 22:14:07 -0500 message: (Man-getpage-in-background): When running under a window-system, ignore $MANWIDTH and $COLUMNS. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-12-15 07:50:05 +0000 +++ lisp/ChangeLog 2011-12-16 03:14:07 +0000 @@ -1,3 +1,8 @@ +2011-12-13 Sam Steingold + + * man.el (Man-getpage-in-background): When running under a + window-system, ignore $MANWIDTH and $COLUMNS. + 2011-12-15 Kenichi Handa * language/ethio-util.el: Change coding tag to utf-8-emacs. === modified file 'lisp/man.el' --- lisp/man.el 2011-12-04 08:02:42 +0000 +++ lisp/man.el 2011-12-16 03:14:07 +0000 @@ -933,7 +933,8 @@ ;; minal (using an ioctl(2) if available, the value of ;; $COLUMNS, or falling back to 80 characters if nei- ;; ther is available). - (unless (or (getenv "MANWIDTH") (getenv "COLUMNS")) + (when (or window-system + (not (or (getenv "MANWIDTH") (getenv "COLUMNS")))) ;; This isn't strictly correct, since we don't know how ;; the page will actually be displayed, but it seems ;; reasonable. ------------------------------------------------------------ revno: 106683 committer: Juri Linkov branch nick: trunk timestamp: Fri 2011-12-16 01:35:40 +0200 message: * lisp/gnus/mm-decode.el (mm-inline-media-tests): Add missing `mm-handle-media-subtype'. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2011-12-12 05:32:49 +0000 +++ lisp/gnus/ChangeLog 2011-12-15 23:35:40 +0000 @@ -1,3 +1,7 @@ +2011-12-15 Juri Linkov + + * mm-decode.el (mm-inline-media-tests): Add missing `mm-handle-media-subtype'. + 2011-12-09 Tassilo Horn * message.el (message-valid-fqdn-regexp): Update with newly approved === modified file 'lisp/gnus/mm-decode.el' --- lisp/gnus/mm-decode.el 2011-11-25 07:14:48 +0000 +++ lisp/gnus/mm-decode.el 2011-12-15 23:35:40 +0000 @@ -275,7 +275,7 @@ (ignore-errors (if (fboundp 'create-image) (create-image (buffer-string) 'imagemagick 'data-p) - (mm-create-image-xemacs type))))) + (mm-create-image-xemacs (mm-handle-media-subtype handle)))))) (when image (setcar (cdr handle) (list "image/imagemagick")) (mm-image-fit-p handle))))))) ------------------------------------------------------------ revno: 106682 fixes bug(s): http://debbugs.gnu.org/10112 committer: Juri Linkov branch nick: trunk timestamp: Fri 2011-12-16 01:28:56 +0200 message: * src/image.c (imagemagick_error): New function. (imagemagick_load_image): Comment out `MagickSetResolution' call. Use `imagemagick_error' where ImageMagick functions return `MagickFalse'. (Fimagemagick_types): Add `Fnreverse' to return the list in the proper order. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2011-12-15 02:12:08 +0000 +++ src/ChangeLog 2011-12-15 23:28:56 +0000 @@ -1,3 +1,12 @@ +2011-12-15 Juri Linkov + + * image.c (imagemagick_error): New function. (Bug#10112) + (imagemagick_load_image): Comment out `MagickSetResolution' call. + Use `imagemagick_error' where ImageMagick functions return + `MagickFalse'. + (Fimagemagick_types): Add `Fnreverse' to return the list in the + proper order. + 2011-12-15 YAMAMOTO Mitsuharu * xftfont.c (xftfont_draw): Use the font metrics of s->font to === modified file 'src/image.c' --- src/image.c 2011-11-24 19:02:39 +0000 +++ src/image.c 2011-12-15 23:28:56 +0000 @@ -7564,6 +7564,22 @@ MagickPixelPacket *); #endif +/* Log ImageMagick error message. + Useful when a ImageMagick function returns the status `MagickFalse'. */ + +static void +imagemagick_error (MagickWand *wand) +{ + char *description; + ExceptionType severity; + + description = MagickGetException (wand, &severity); + image_error ("ImageMagick error: %s", + make_string (description, strlen (description)), + Qnil); + description = (char *) MagickRelinquishMemory (description); +} + /* Helper function for imagemagick_load, which does the actual loading given contents and size, apart from frame and image structures, passed from imagemagick_load. Uses librimagemagick to do most of @@ -7618,6 +7634,7 @@ image = image_spec_value (img->spec, QCindex, NULL); ino = INTEGERP (image) ? XFASTINT (image) : 0; ping_wand = NewMagickWand (); + /* MagickSetResolution (ping_wand, 2, 2); (Bug#10112) */ if (filename != NULL) { @@ -7628,7 +7645,12 @@ status = MagickPingImageBlob (ping_wand, contents, size); } - MagickSetResolution (ping_wand, 2, 2); + if (status == MagickFalse) + { + imagemagick_error (ping_wand); + DestroyMagickWand (ping_wand); + return 0; + } if (! (0 <= ino && ino < MagickGetNumberImages (ping_wand))) { @@ -7669,7 +7691,10 @@ { image_wand = NewMagickWand (); if (MagickReadImageBlob (image_wand, contents, size) == MagickFalse) - goto imagemagick_error; + { + imagemagick_error (image_wand); + goto imagemagick_error; + } } /* If width and/or height is set in the display spec assume we want @@ -7697,6 +7722,7 @@ if (status == MagickFalse) { image_error ("Imagemagick scale failed", Qnil, Qnil); + imagemagick_error (image_wand); goto imagemagick_error; } } @@ -7751,6 +7777,7 @@ if (status == MagickFalse) { image_error ("Imagemagick image rotate failed", Qnil, Qnil); + imagemagick_error (image_wand); goto imagemagick_error; } } @@ -7975,7 +8002,7 @@ Qimagemagicktype = intern (imtypes[i]); typelist = Fcons (Qimagemagicktype, typelist); } - return typelist; + return Fnreverse (typelist); } #endif /* defined (HAVE_IMAGEMAGICK) */ ------------------------------------------------------------ revno: 106681 committer: Paul Eggert branch nick: trunk timestamp: Thu 2011-12-15 14:14:12 -0800 message: Spelling fixes. diff: === modified file 'doc/misc/ede.texi' --- doc/misc/ede.texi 2011-12-15 07:24:10 +0000 +++ doc/misc/ede.texi 2011-12-15 22:14:12 +0000 @@ -2483,7 +2483,7 @@ @deffn Method ede-proj-makefile-insert-source-variables :PRIMARY this Insert bin_PROGRAMS variables needed by target @var{THIS}. -We aren't acutally inserting SOURCE details, but this is used by the +We aren't actually inserting SOURCE details, but this is used by the Makefile.am generator, so use it to add this important bin program. @end deffn @@ -2624,7 +2624,7 @@ @deffn Method ede-proj-makefile-insert-automake-pre-variables :AFTER this Insert bin_PROGRAMS variables needed by target @var{THIS}. -We aren't acutally inserting SOURCE details, but this is used by the +We aren't actually inserting SOURCE details, but this is used by the Makefile.am generator, so use it to add this important bin program. @end deffn === modified file 'leim/quail/persian.el' --- leim/quail/persian.el 2011-12-05 08:55:25 +0000 +++ leim/quail/persian.el 2011-12-15 22:14:12 +0000 @@ -27,7 +27,7 @@ ;;; Commentary: ;; ;; This file contains a collection of input methods for -;; Persian languages (Farsi, Urdu, Pashto/Afghanic, ...) +;; Persian languages - Farsi, Urdu, Pashto (Afghani), ... ;; ;; At this time, the following input methods are specified: ;; === modified file 'lisp/cedet/ede/pmake.el' --- lisp/cedet/ede/pmake.el 2011-05-10 13:57:12 +0000 +++ lisp/cedet/ede/pmake.el 2011-12-15 22:14:12 +0000 @@ -335,7 +335,7 @@ ; ; (oref this variables)) ; -; ;; Add in all variables from the configuration not allready covered. +; ;; Add in all variables from the configuration not already covered. ; (mapc (lambda (c) ; ; (if (member (car c) conf-done) @@ -372,7 +372,7 @@ (setq conf-done (cons (car c) conf-done)))) (insert (cdr c) "\n")) (oref this variables)) - ;; Add in all variables from the configuration not allready covered. + ;; Add in all variables from the configuration not already covered. (mapc (lambda (c) (if (member (car c) conf-done) nil @@ -430,7 +430,7 @@ this (oref proj configuration-default))) (conf-done nil) ) - ;; Add in all variables from the configuration not allready covered. + ;; Add in all variables from the configuration not already covered. (mapc (lambda (c) (if (member (car c) conf-done) nil === modified file 'lisp/cedet/ede/proj-archive.el' --- lisp/cedet/ede/proj-archive.el 2011-01-25 04:08:28 +0000 +++ lisp/cedet/ede/proj-archive.el 2011-12-15 22:14:12 +0000 @@ -46,7 +46,7 @@ (defmethod ede-proj-makefile-insert-source-variables :BEFORE ((this ede-proj-target-makefile-archive) &optional moresource) "Insert bin_PROGRAMS variables needed by target THIS. -We aren't acutally inserting SOURCE details, but this is used by the +We aren't actually inserting SOURCE details, but this is used by the Makefile.am generator, so use it to add this important bin program." (ede-pmake-insert-variable-shared (concat "lib" (ede-name this) "_a_LIBRARIES") === modified file 'lisp/cedet/ede/proj-shared.el' --- lisp/cedet/ede/proj-shared.el 2011-11-25 07:14:48 +0000 +++ lisp/cedet/ede/proj-shared.el 2011-12-15 22:14:12 +0000 @@ -181,7 +181,7 @@ (defmethod ede-proj-makefile-insert-automake-pre-variables ((this ede-proj-target-makefile-shared-object)) "Insert bin_PROGRAMS variables needed by target THIS. -We aren't acutally inserting SOURCE details, but this is used by the +We aren't actually inserting SOURCE details, but this is used by the Makefile.am generator, so use it to add this important bin program." (ede-pmake-insert-variable-shared "lib_LTLIBRARIES" (insert (concat "lib" (ede-name this) ".la")))) === modified file 'lisp/ido.el' --- lisp/ido.el 2011-11-27 04:43:11 +0000 +++ lisp/ido.el 2011-12-15 22:14:12 +0000 @@ -308,7 +308,7 @@ ;; ifindf package back into iswitchb. ;; ;; This is basically what ido (interactively do) is all about; but I -;; found it ackward to merge my changes into the "iswitchb-" namespace, +;; found it awkward to merge my changes into the "iswitchb-" namespace, ;; so I invented a common "ido-" namespace for the merged packages. ;; ;; This version is based on ido.el version 1.57 released on === modified file 'lisp/ldefs-boot.el' --- lisp/ldefs-boot.el 2011-12-01 11:22:19 +0000 +++ lisp/ldefs-boot.el 2011-12-15 22:14:12 +0000 @@ -3608,7 +3608,7 @@ ARG := REG | integer OPERATOR := - ;; Normal arithmethic operators (same meaning as C code). + ;; Normal arithmetic operators (same meaning as C code). + | - | * | / | % ;; Bitwise operators (same meaning as C code) === modified file 'lisp/loadhist.el' --- lisp/loadhist.el 2011-11-20 07:30:16 +0000 +++ lisp/loadhist.el 2011-12-15 22:14:12 +0000 @@ -156,7 +156,7 @@ (dolist (buffer (buffer-list)) (set-buffer buffer) (let ((proposed major-mode)) - ;; Look for an antecessor mode not defined in the feature we're processing + ;; Look for a predecessor mode not defined in the feature we're processing (while (and proposed (rassq proposed unload-function-defs-list)) (setq proposed (get proposed 'derived-mode-parent))) (unless (eq proposed major-mode) === modified file 'lisp/progmodes/ebnf2ps.el' --- lisp/progmodes/ebnf2ps.el 2011-11-18 08:31:02 +0000 +++ lisp/progmodes/ebnf2ps.el 2011-12-15 22:14:12 +0000 @@ -3260,7 +3260,7 @@ % --- Corners -%>corner Right Descendent: height arrow corner_RD +%>corner Right Descendant: height arrow corner_RD % _ | arrow % / height > 0 | 0 - none % | | 1 - right @@ -3299,7 +3299,7 @@ Gstroke }def -%>corner Right Ascendent: height arrow corner_RA +%>corner Right Ascendant: height arrow corner_RA % | arrow % | height > 0 | 0 - none % / | 1 - right @@ -3338,7 +3338,7 @@ Gstroke }def -%>corner Left Descendent: height arrow corner_LD +%>corner Left Descendant: height arrow corner_LD % _ | arrow % \\ height > 0 | 0 - none % | | 1 - right @@ -3377,7 +3377,7 @@ Gstroke }def -%>corner Left Ascendent: height arrow corner_LA +%>corner Left Ascendant: height arrow corner_LA % | arrow % | height > 0 | 0 - none % \\ | 1 - right === modified file 'lisp/progmodes/vera-mode.el' --- lisp/progmodes/vera-mode.el 2011-10-21 14:48:39 +0000 +++ lisp/progmodes/vera-mode.el 2011-12-15 22:14:12 +0000 @@ -427,7 +427,7 @@ "icompare" "insert" "inst_get_at_least" "inst_get_auto_bin_max" "inst_get_collect" "inst_get_cov_weight" "inst_get_coverage_goal" "inst_getcross_bin_max" "inst_query" "inst_set_at_least" - "inst_set_auto_bin_max" "inst_set_bin_activiation" "inst_set_collect" + "inst_set_auto_bin_max" "inst_set_bin_activation" "inst_set_collect" "inst_set_cov_weight" "inst_set_coverage_goal" "inst_set_cross_bin_max" "itoa" "last" "last_index" "len" "load" @@ -438,7 +438,7 @@ "push_front" "putc" "query" "query_str" "rand_mode" "randomize" "reserve" "reverse" "rsort" - "search" "set_at_least" "set_auto_bin_max" "set_bin_activiation" + "search" "set_at_least" "set_auto_bin_max" "set_bin_activation" "set_cov_weight" "set_coverage_goal" "set_cross_bin_max" "set_name" "size" "sort" "substr" "sum" "thismatch" "tolower" "toupper" === modified file 'test/cedet/tests/testpolymorph.cpp' --- test/cedet/tests/testpolymorph.cpp 2011-11-17 09:09:20 +0000 +++ test/cedet/tests/testpolymorph.cpp 2011-12-15 22:14:12 +0000 @@ -83,7 +83,7 @@ }; } -// Test 5 - Templates w/ full specicialization which may or may not share +// Test 5 - Templates w/ full specialization which may or may not share // common functions. namespace template_full_spec { template class test ------------------------------------------------------------ revno: 106680 committer: Glenn Morris branch nick: trunk timestamp: Thu 2011-12-15 06:18:13 -0500 message: Auto-commit of generated files. diff: === modified file 'autogen/configure' --- autogen/configure 2011-12-11 11:20:56 +0000 +++ autogen/configure 2011-12-15 11:18:13 +0000 @@ -10018,7 +10018,7 @@ ## Use mmap directly for allocating larger buffers. ## FIXME this comes from src/s/{gnu,gnu-linux}.h: ## #ifdef DOUG_LEA_MALLOC; #undef REL_ALLOC; #endif - ## Does the AC_FUNC_MMAP test below make this check unecessary? + ## Does the AC_FUNC_MMAP test below make this check unnecessary? case "$opsys" in gnu*) REL_ALLOC=no ;; esac ------------------------------------------------------------ revno: 106679 [merge] committer: Kenichi Handa branch nick: trunk timestamp: Thu 2011-12-15 16:51:30 +0900 message: Fix Ethiopic related codes for deleted variables and functions. diff: === modified file 'leim/ChangeLog' --- leim/ChangeLog 2011-12-04 08:02:42 +0000 +++ leim/ChangeLog 2011-12-15 07:50:05 +0000 @@ -1,3 +1,8 @@ +2011-12-15 Kenichi Handa + + * quail/ethiopic.el ("ethiopic"): Do not refer to + ethio-prefer-ascii-punctuation. + 2011-11-20 Juanma Barranquero * quail/hangul.el (hangul-character): Fix typo. === modified file 'leim/quail/ethiopic.el' --- leim/quail/ethiopic.el 2011-11-25 07:14:48 +0000 +++ leim/quail/ethiopic.el 2011-12-15 07:50:05 +0000 @@ -39,7 +39,7 @@ "ethiopic" "Ethiopic" '("$(3$Q#U!.(B " (ethio-prefer-ascii-space "_" "$(3$h(B") - (ethio-prefer-ascii-punctuation "." "$(3$i(B")) + "$(3$i(B") t " Quail package for Ethiopic (Tigrigna and Amharic) When you are in Ethiopic language environment, the following special === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-12-14 21:05:20 +0000 +++ lisp/ChangeLog 2011-12-15 07:50:05 +0000 @@ -1,3 +1,9 @@ +2011-12-15 Kenichi Handa + + * language/ethio-util.el: Change coding tag to utf-8-emacs. + (setup-ethiopic-environment-internal): Comment out key-binding for + ethio-toggle-punctuation. + 2011-12-13 Alan Mackenzie Add the switch statement to AWK Mode. === modified file 'lisp/language/ethio-util.el' --- lisp/language/ethio-util.el 2011-12-05 08:55:25 +0000 +++ lisp/language/ethio-util.el 2011-12-15 07:50:05 +0000 @@ -1,4 +1,4 @@ -;;; ethio-util.el --- utilities for Ethiopic -*- coding: utf-8; -*- +;;; ethio-util.el --- utilities for Ethiopic -*- coding: utf-8-emacs; -*- ;; Copyright (C) 1997-1998, 2002-2011 Free Software Foundation, Inc. ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, @@ -48,7 +48,7 @@ ([f4] . ethio-sera-to-fidel-buffer) ([S-f4] . ethio-sera-to-fidel-region) ([C-f4] . ethio-sera-to-fidel-marker) - ([S-f5] . ethio-toggle-punctuation) + ;; ([S-f5] . ethio-toggle-punctuation) ([S-f6] . ethio-modify-vowel) ([S-f7] . ethio-replace-space) ;; ([S-f8] . ethio-input-special-character) ; deprecated ------------------------------------------------------------ Use --include-merges or -n0 to see merged revisions.