Mercurial > emacs
changeset 107288:2bdc8dbc5648
Merge from mainline.
| author | Katsumi Yamaoka <yamaoka@jpl.org> |
|---|---|
| date | Wed, 24 Feb 2010 21:53:00 +0000 |
| parents | 1426214b1d2b (current diff) 4949f0c38c03 (diff) |
| children | 6865dc721807 |
| files | |
| diffstat | 8 files changed, 49 insertions(+), 33 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Wed Feb 24 10:47:10 2010 +0000 +++ b/lisp/ChangeLog Wed Feb 24 21:53:00 2010 +0000 @@ -1,3 +1,13 @@ +2010-02-24 Chong Yidong <cyd@stupidchicken.com> + + * files.el (hack-local-variables-filter): For eval forms, also + check safe-local-variable-p (Bug#5636). + +2010-02-24 Eduard Wiebe <usenet@pusto.de> + + * javascript.el (wisent-javascript-jv-expand-tag): Avoid c(ad)ddr + and use c(ad)r of cddr (Bug#5640). + 2010-02-22 Michael Albinus <michael.albinus@gmx.de> * net/tramp.el (tramp-do-copy-or-rename-file-out-of-band): Protect
--- a/lisp/cedet/semantic/wisent/javascript.el Wed Feb 24 10:47:10 2010 +0000 +++ b/lisp/cedet/semantic/wisent/javascript.el Wed Feb 24 21:53:00 2010 +0000 @@ -48,8 +48,8 @@ elts (cdr elts) clone (semantic-tag-clone tag (car elt)) value (car (cdr elt)) - start (if elts (caddr elt) (semantic-tag-start tag)) - end (if xpand (cdddr elt) (semantic-tag-end tag)) + start (if elts (car (cddr elt)) (semantic-tag-start tag)) + end (if xpand (cdr (cddr elt)) (semantic-tag-end tag)) xpand (cons clone xpand)) ;; Set the definition of the cloned tag (semantic-tag-put-attribute clone :default-value value)
--- a/lisp/files.el Wed Feb 24 10:47:10 2010 +0000 +++ b/lisp/files.el Wed Feb 24 21:53:00 2010 +0000 @@ -2981,6 +2981,7 @@ (push elt all-vars) (or (eq enable-local-eval t) (hack-one-local-variable-eval-safep (eval (quote val))) + (safe-local-variable-p var val) (push elt unsafe-vars)))) ;; Ignore duplicates (except `mode') in the present list. ((and (assq var all-vars) (not (eq var 'mode))) nil)
--- a/lisp/gnus/ChangeLog Wed Feb 24 10:47:10 2010 +0000 +++ b/lisp/gnus/ChangeLog Wed Feb 24 21:53:00 2010 +0000 @@ -1,3 +1,8 @@ +2010-02-24 Stefan Monnier <monnier@iro.umontreal.ca> + + * gnus-art.el (gnus-treat-display-x-face): Don't burp if + shell-command-to-string signals an error (bug#5299). + 2010-02-24 Glenn Morris <rgm@gnu.org> * message.el (message-smtpmail-send-it)
--- a/lisp/gnus/gnus-art.el Wed Feb 24 10:47:10 2010 +0000 +++ b/lisp/gnus/gnus-art.el Wed Feb 24 21:53:00 2010 +0000 @@ -1422,8 +1422,12 @@ (gnus-image-type-available-p 'xbm) (if (featurep 'xemacs) (featurep 'xface) - (and (string-match "^0x" (shell-command-to-string "uncompface")) - (executable-find "icontopbm"))) + (condition-case nil + (and (string-match "^0x" (shell-command-to-string "uncompface")) + (executable-find "icontopbm")) + ;; shell-command-to-string may signal an error, e.g. if + ;; shell-file-name is not found. + (error nil))) 'head) "Display X-Face headers. Valid values are nil and `head'.
--- a/src/ChangeLog Wed Feb 24 10:47:10 2010 +0000 +++ b/src/ChangeLog Wed Feb 24 21:53:00 2010 +0000 @@ -1,3 +1,14 @@ +2010-02-24 Jan Djärv <jan.h.d@swipnet.se> + + * xterm.c (XTflash): Move declarations before statements. + + * gtkutil.c (xg_get_gdk_display): Remove (unused). + (xg_get_pixbuf_from_pix_and_mask, xg_create_frame_widgets) + (xg_toggle_notify_cb, xg_set_toolkit_scroll_bar_thumb) + (xg_create_tool_bar): Remove unused variables. + (x_wm_set_size_hint): Move declarations before statements. + (xg_create_frame_widgets): Remove variable grav, + 2010-02-21 Chong Yidong <cyd@stupidchicken.com> * m/arm.h: Define the LIB_GCC flag to be -lgcc_s (Bug#5518).
--- a/src/gtkutil.c Wed Feb 24 10:47:10 2010 +0000 +++ b/src/gtkutil.c Wed Feb 24 21:53:00 2010 +0000 @@ -58,15 +58,6 @@ static GdkDisplay *gdpy_def; -/* Return the GdkDisplay that corresponds to the X display DPY. */ - -static GdkDisplay * -xg_get_gdk_display (dpy) - Display *dpy; -{ - return gdk_x11_lookup_xdisplay (dpy); -} - /* When the GTK widget W is to be created on a display for F that is not the default display, set the display for W. W can be a GtkMenu or a GtkWindow widget. */ @@ -252,10 +243,8 @@ GdkPixmap *gmask; GdkColormap *cmap; { - int x, y, width, height, rowstride, mask_rowstride; + int width, height; GdkPixbuf *icon_buf, *tmp_buf; - guchar *pixels; - guchar *mask_pixels; gdk_drawable_get_size (gpix, &width, &height); tmp_buf = gdk_pixbuf_get_from_drawable (NULL, gpix, cmap, @@ -776,7 +765,6 @@ GtkWidget *wfixed; GdkColor bg; GtkRcStyle *style; - int i; char *title = 0; BLOCK_INPUT; @@ -844,8 +832,8 @@ and specify it. GTK will itself handle calculating the real position this way. */ xg_set_geometry (f); - int grav = gtk_window_get_gravity (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f))); - f->win_gravity = grav; + f->win_gravity + = gtk_window_get_gravity (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f))); gtk_widget_add_events (wfixed, GDK_POINTER_MOTION_MASK @@ -901,12 +889,6 @@ long flags; int user_position; { - /* Don't set size hints during initialization; that apparently leads - to a race condition. See the thread at - http://lists.gnu.org/archive/html/emacs-devel/2008-10/msg00033.html */ - if (NILP (Vafter_init_time) || !FRAME_GTK_OUTER_WIDGET (f)) - return; - /* Must use GTK routines here, otherwise GTK resets the size hints to its own defaults. */ GdkGeometry size_hints; @@ -915,6 +897,12 @@ int min_rows = 0, min_cols = 0; int win_gravity = f->win_gravity; + /* Don't set size hints during initialization; that apparently leads + to a race condition. See the thread at + http://lists.gnu.org/archive/html/emacs-devel/2008-10/msg00033.html */ + if (NILP (Vafter_init_time) || !FRAME_GTK_OUTER_WIDGET (f)) + return; + if (flags) { memset (&size_hints, 0, sizeof (size_hints)); @@ -1391,7 +1379,6 @@ if (strcmp (arg1->name, "show-hidden") == 0) { - GtkFileChooser *dialog = GTK_FILE_CHOOSER (gobject); GtkWidget *wtoggle = GTK_WIDGET (user_data); gboolean visible, toggle_on; @@ -3347,8 +3334,6 @@ if (changed || (int) gtk_range_get_value (GTK_RANGE (wscroll)) != value) { - GtkWidget *wfixed = f->output_data.x->edit_widget; - BLOCK_INPUT; /* gtk_range_set_value invokes the callback. Set @@ -3801,7 +3786,6 @@ FRAME_PTR f; { struct x_output *x = f->output_data.x; - GtkRequisition req; x->toolbar_widget = gtk_toolbar_new (); x->toolbar_detached = 0;
--- a/src/xterm.c Wed Feb 24 10:47:10 2010 +0000 +++ b/src/xterm.c Wed Feb 24 21:53:00 2010 +0000 @@ -3019,13 +3019,14 @@ /* Use Gdk routines to draw. This way, we won't draw over scroll bars when the scroll bars and the edit widget share the same X window. */ GdkGCValues vals; + GdkGC *gc; vals.foreground.pixel = (FRAME_FOREGROUND_PIXEL (f) ^ FRAME_BACKGROUND_PIXEL (f)); vals.function = GDK_XOR; - GdkGC *gc = gdk_gc_new_with_values (FRAME_GTK_WIDGET (f)->window, - &vals, - GDK_GC_FUNCTION - | GDK_GC_FOREGROUND); + gc = gdk_gc_new_with_values (FRAME_GTK_WIDGET (f)->window, + &vals, + GDK_GC_FUNCTION + | GDK_GC_FOREGROUND); #define XFillRectangle(d, win, gc, x, y, w, h) \ gdk_draw_rectangle (FRAME_GTK_WIDGET (f)->window, \ gc, TRUE, x, y, w, h)