commit 051533c6fa63ee10e58e83823ba962a005ba68f9 (HEAD, refs/remotes/origin/master) Author: Konstantin Kharlamov Date: Tue Apr 2 23:49:58 2019 +0300 Minor cleanup in widget.c * src/widget.c (update_wm_hints): Remove variables that are always zero, and simplify all expressions which used them. (Bug#35062) diff --git a/src/widget.c b/src/widget.c index c695bd5f30..508974dd46 100644 --- a/src/widget.c +++ b/src/widget.c @@ -297,7 +297,6 @@ update_wm_hints (EmacsFrame ew) int char_height; int base_width; int base_height; - int min_rows = 0, min_cols = 0; /* This happens when the frame is just created. */ if (! wmshell) return; @@ -323,8 +322,8 @@ update_wm_hints (EmacsFrame ew) XtNbaseHeight, (XtArgVal) base_height, XtNwidthInc, (XtArgVal) (frame_resize_pixelwise ? 1 : cw), XtNheightInc, (XtArgVal) (frame_resize_pixelwise ? 1 : ch), - XtNminWidth, (XtArgVal) (base_width + min_cols * cw), - XtNminHeight, (XtArgVal) (base_height + min_rows * ch), + XtNminWidth, (XtArgVal) base_width, + XtNminHeight, (XtArgVal) base_height, NULL); } commit 3187efe713938ad41b676de9dbd92f986d46aa05 Author: Konstantin Kharlamov Date: Tue Apr 2 03:23:27 2019 +0300 Minor cleanup in gtkutil.c * src/gtkutil.c (x_wm_set_size_hint): Remove variables that are always zero, and simplify all expressions which used them. (Bug#35062) diff --git a/src/gtkutil.c b/src/gtkutil.c index 4bd73b1a6d..b130692c87 100644 --- a/src/gtkutil.c +++ b/src/gtkutil.c @@ -1401,7 +1401,6 @@ x_wm_set_size_hint (struct frame *f, long int flags, bool user_position) GdkGeometry size_hints; gint hint_flags = 0; int base_width, base_height; - int min_rows = 0, min_cols = 0; int win_gravity = f->win_gravity; Lisp_Object fs_state, frame; int scale = xg_get_scale (f); @@ -1450,13 +1449,10 @@ x_wm_set_size_hint (struct frame *f, long int flags, bool user_position) base_height = FRAME_TEXT_LINES_TO_PIXEL_HEIGHT (f, 1) + FRAME_MENUBAR_HEIGHT (f) + FRAME_TOOLBAR_HEIGHT (f); - if (min_cols > 0) --min_cols; /* We used one col in base_width = ... 1); */ - if (min_rows > 0) --min_rows; /* We used one row in base_height = ... 1); */ - size_hints.base_width = base_width; size_hints.base_height = base_height; - size_hints.min_width = base_width + min_cols * FRAME_COLUMN_WIDTH (f); - size_hints.min_height = base_height + min_rows * FRAME_LINE_HEIGHT (f); + size_hints.min_width = base_width; + size_hints.min_height = base_height; /* These currently have a one to one mapping with the X values, but I don't think we should rely on that. */ commit 9da8f22de09c73e9557161fd7bb189138ce1fe2f Author: Katsumi Yamaoka Date: Fri Apr 5 04:25:06 2019 +0000 Make `move article' work again (bug#33653) * lisp/gnus/gnus-sum.el (gnus-summary-move-article): Back to while loop m dolist that blocks nov and active from saving (bug#33653). diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el index f5853a2430..21f0e5951c 100644 --- a/lisp/gnus/gnus-sum.el +++ b/lisp/gnus/gnus-sum.el @@ -9979,7 +9979,7 @@ ACTION can be either `move' (the default), `crosspost' or `copy'." (crosspost "Crosspost" "Crossposting"))) (copy-buf (save-excursion (nnheader-set-temp-buffer " *copy article*"))) - art-group to-method new-xref to-groups + art-group to-method new-xref article to-groups articles-to-update-marks encoded) (unless (assq action names) (error "Unknown action %s" action)) @@ -10029,7 +10029,8 @@ ACTION can be either `move' (the default), `crosspost' or `copy'." (or (car select-method) (gnus-group-decoded-name to-newsgroup)) articles) - (dolist (article articles) + (while articles + (setq article (pop articles)) ;; Set any marks that may have changed in the summary buffer. (when gnus-preserve-marks (gnus-summary-push-marks-to-backend article)) commit a68c96863289d5d8ccfc2f775d0018a2721c5e53 Author: Glenn Morris Date: Thu Apr 4 20:41:02 2019 -0400 ; Fix copyright years diff --git a/lisp/leim/quail/sami.el b/lisp/leim/quail/sami.el index d4cf4ec96e..7cfd0b7348 100644 --- a/lisp/leim/quail/sami.el +++ b/lisp/leim/quail/sami.el @@ -1,6 +1,6 @@ ;;; sami.el --- Quail package for inputting Sámi -*-coding: utf-8;-*- -;; Copyright (C) 1998, 2001-2019 Free Software Foundation, Inc. +;; Copyright (C) 2019 Free Software Foundation, Inc. ;; Author: Wojciech S. Gac ;; Maintainer: Wojciech S. Gac > commit 905f6195191a518b7bb2dbdf6eacae41d31fc54e Author: Troy Hinckley Date: Wed Jan 16 14:47:07 2019 -0800 Don't check comp-buffer-name-function in derived mode (Bug#34956) * lisp/progmodes/compile.el (define-compilation-mode): Remove 'compilation-buffer-name-function' from the list of overridden variables to ensure that it is not mistaken for a variable that can be major mode specific. 'compilation-buffer-name-function' is used before the major mode is loaded, therefore overriding it here is ineffectual. Also, the function 'compilation-start' takes an optional argument name-function, so there is already a mechanism to override it. diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el index 6d5775209c..1a0d9bdbb7 100644 --- a/lisp/progmodes/compile.el +++ b/lisp/progmodes/compile.el @@ -2056,8 +2056,7 @@ by replacing the first word, e.g., `compilation-scroll-output' from (if (boundp 'byte-compile-bound-variables) (memq (cdr v) byte-compile-bound-variables))) `(set (make-local-variable ',(car v)) ,(cdr v)))) - '(compilation-buffer-name-function - compilation-directory-matcher + '(compilation-directory-matcher compilation-error compilation-error-regexp-alist compilation-error-regexp-alist-alist commit 690c678fb6c1fb5b2f828f9bb90782bd0b01c399 Author: Basil L. Contovounesios Date: Thu Apr 4 23:37:08 2019 +0100 Fix comment-empty-lines docstring (bug#35152) * lisp/newcomment.el (comment-empty-lines): Consistently use US commas in docstring. Fix indentation of and typo in custom :type. diff --git a/lisp/newcomment.el b/lisp/newcomment.el index bb371c5d7a..9d919ccbbe 100644 --- a/lisp/newcomment.el +++ b/lisp/newcomment.el @@ -327,11 +327,11 @@ behavior for explicit filling, you might as well use \\[newline-and-indent]." (defcustom comment-empty-lines nil "If nil, `comment-region' does not comment out empty lines. If t, it always comments out empty lines. -If `eol' it only comments out empty lines if comments are -terminated by the end of line (i.e. `comment-end' is empty)." +If `eol', it only comments out empty lines if comments are +terminated by the end of line (i.e., `comment-end' is empty)." :type '(choice (const :tag "Never" nil) - (const :tag "Always" t) - (const :tag "EOl-terminated" eol)) + (const :tag "Always" t) + (const :tag "EOL-terminated" eol)) :group 'comment) ;;;; commit d63aa2f3e5009e0e8ec83fecc4f0bbe2866e5a59 Author: Stefan Monnier Date: Thu Apr 4 16:27:29 2019 -0400 * lisp/progmodes/compile.el (compilation-error-regexp-alist): Typo Reported by Kévin Le Gouguec diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el index 5bfb0bf901..6d5775209c 100644 --- a/lisp/progmodes/compile.el +++ b/lisp/progmodes/compile.el @@ -562,7 +562,7 @@ LINE, END-LINE, COL, and END-COL can also be functions of no argument that return the corresponding line or column number. They can assume REGEXP has just been matched, and should correspondingly preserve this match data. -f/usr/shaTYPE is 2 or nil for a real error or 1 for warning or 0 for info. +TYPE is 2 or nil for a real error or 1 for warning or 0 for info. TYPE can also be of the form (WARNING . INFO). In that case this will be equivalent to 1 if the WARNING'th subexpression matched or else equivalent to 0 if the INFO'th subexpression matched. commit 81f64da220b7a8b46f64212724cb2be6c99a0cac Author: Stefan Monnier Date: Thu Apr 4 13:46:30 2019 -0400 * lisp/desktop.el (desktop--v2s): Add case for defstructs (bug#35131) diff --git a/lisp/desktop.el b/lisp/desktop.el index acabde5eb2..97c057e201 100644 --- a/lisp/desktop.el +++ b/lisp/desktop.el @@ -856,6 +856,19 @@ QUOTE may be `may' (value may be quoted), `',(cdr el) (cdr el))) pass1))) (cons 'may `[,@(mapcar #'cdr pass1)])))) + ((and (recordp value) (symbolp (aref value 0))) + (let* ((pass1 (let ((res ())) + (dotimes (i (length value)) + (push (desktop--v2s (aref value i)) res)) + (nreverse res))) + (special (assq nil pass1))) + (if special + (cons nil `(record + ,@(mapcar (lambda (el) + (if (eq (car el) 'must) + `',(cdr el) (cdr el))) + pass1))) + (cons 'may (apply #'record (mapcar #'cdr pass1)))))) ((consp value) (let ((p value) newlist commit 18c02f7e078ae574d03ec67939c4755ce3554fb2 Author: Michael Albinus Date: Thu Apr 4 13:41:53 2019 +0200 * test/lisp/net/tramp-tests.el (tramp-test43-asynchronous-requests): Make it fit for tramp-adb. Apply better check in process filter. diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el index 1ee11f0d38..96e4438ec1 100644 --- a/test/lisp/net/tramp-tests.el +++ b/test/lisp/net/tramp-tests.el @@ -3923,6 +3923,7 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'." :tags '(:expensive-test) (skip-unless (tramp--test-enabled)) (skip-unless (or (tramp--test-adb-p) (tramp--test-sh-p))) + ;; `make-process' supports file name handlers since Emacs 27. (skip-unless (tramp--test-emacs27-p)) (dolist (quoted (if (tramp--test-expensive-test) '(nil t) '(nil))) @@ -5362,20 +5363,14 @@ process sentinels. They shall not disturb each other." ;; we mark it as unstable. :tags '(:expensive-test :unstable) (skip-unless (tramp--test-enabled)) - (skip-unless (tramp--test-sh-p)) - ;; This test is sensible wrt to other running tests. Let it work - ;; only if it is the only selected test. - ;; FIXME: There must be a better solution. - (skip-unless - (= 1 (length - (ert-select-tests (ert--stats-selector ert--current-run-stats) t)))) + (skip-unless (or (tramp--test-adb-p) (tramp--test-sh-p))) (with-timeout (tramp--test-asynchronous-requests-timeout (tramp--test-timeout-handler)) (define-key special-event-map [sigusr1] #'tramp--test-timeout-handler) (let* (;; For the watchdog. (default-directory (expand-file-name temporary-file-directory)) - (shell-file-name "/bin/sh") + (shell-file-name (if (tramp--test-adb-p) "/system/bin/sh" "/bin/sh")) (watchdog (start-process-shell-command "*watchdog*" nil @@ -5475,7 +5470,7 @@ process sentinels. They shall not disturb each other." "Process filter %s %s %s" proc string (current-time-string)) (with-current-buffer (process-buffer proc) (insert string)) - (unless (zerop (length string)) + (when (< (process-get proc 'bar) 2) (dired-uncache (process-get proc 'foo)) (should (file-attributes (process-get proc 'foo)))))) ;; Add process sentinel. It shall not perform remote @@ -5528,7 +5523,12 @@ process sentinels. They shall not disturb each other." (dolist (buf buffers) (with-current-buffer buf (should - (string-equal (format "%s\n%s\n" buf buf) (buffer-string))))) + (string-equal + ;; tramp-adb.el echoes, so we must add the three strings. + (if (tramp--test-adb-p) + (format "%s\n%s\n%s\n%s\n%s\n" buf buf buf buf buf) + (format "%s\n%s\n" buf buf)) + (buffer-string))))) (should-not (directory-files tmp-name nil directory-files-no-dot-files-regexp))) @@ -5729,8 +5729,8 @@ Since it unloads Tramp, it shall be the last test to run." ;; do not work properly for `nextcloud'. ;; * Fix `tramp-test29-start-file-process' and ;; `tramp-test30-make-process' on MS Windows (`process-send-eof'?). -;; * Fix Bug#16928 in `tramp-test43-asynchronous-requests'. -;; * Fix `tramp-test44-threads'. +;; * Fix Bug#16928 in `tramp-test43-asynchronous-requests'. Looks +;; like it is resolved now. Remove `:unstable' tag? (provide 'tramp-tests) ;;; tramp-tests.el ends here