mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2024-09-02 17:55:34 +00:00
Merge from origin/emacs-28
5e47d6284b
* lisp/gnus/mm-encode.el (mm-default-file-encoding): Fix "...e71c7a7c60
Fix default-directory of buffers visiting files in renamed...cccaa9c31d
Fix a kill-append regression33828e4818
* doc/misc/eww.texi (Advanced): Correct outdated info (bug...e8d2f40f41
Clean up the MSDOS port338eda09d8
Fix typo in next-error-find-buffer-function # Conflicts: # doc/misc/eww.texi
This commit is contained in:
commit
8804dfdb1a
7 changed files with 43 additions and 26 deletions
|
@ -311,11 +311,9 @@ state the directionality.
|
|||
size or content. By customizing @code{shr-max-image-proportion} you
|
||||
can set the maximal image proportion in relation to the window they
|
||||
are displayed in. E.g., 0.7 means an image is allowed to take up 70%
|
||||
of the width and height. If Emacs supports image scaling (ImageMagick
|
||||
support required) then larger images are scaled down. You can block
|
||||
specific images completely by customizing @code{shr-blocked-images},
|
||||
or, if you want to only allow some specific images, customize
|
||||
@code{shr-allowed-images}.
|
||||
of the width and height. If Emacs supports image scaling, then larger
|
||||
images are scaled down. You can block specific images completely by
|
||||
customizing @code{shr-blocked-images}.
|
||||
|
||||
@vindex shr-inhibit-images
|
||||
You can control image display by customizing
|
||||
|
|
|
@ -1896,22 +1896,23 @@ rename them using `vc-rename-file'."
|
|||
"Rename FILE to NEWNAME.
|
||||
Signal a `file-already-exists' error if a file NEWNAME already exists
|
||||
unless OK-IF-ALREADY-EXISTS is non-nil."
|
||||
(dired-handle-overwrite newname)
|
||||
(dired-maybe-create-dirs (file-name-directory newname))
|
||||
(if (and dired-vc-rename-file
|
||||
(vc-backend file)
|
||||
(ignore-errors (vc-responsible-backend newname)))
|
||||
(vc-rename-file file newname)
|
||||
;; error is caught in -create-files
|
||||
(rename-file file newname ok-if-already-exists))
|
||||
;; Silently rename the visited file of any buffer visiting this file.
|
||||
(and (get-file-buffer file)
|
||||
(with-current-buffer (get-file-buffer file)
|
||||
(set-visited-file-name newname nil t)))
|
||||
(dired-remove-file file)
|
||||
;; See if it's an inserted subdir, and rename that, too.
|
||||
(when (file-directory-p file)
|
||||
(dired-rename-subdir file newname)))
|
||||
(let ((file-is-dir-p (file-directory-p file)))
|
||||
(dired-handle-overwrite newname)
|
||||
(dired-maybe-create-dirs (file-name-directory newname))
|
||||
(if (and dired-vc-rename-file
|
||||
(vc-backend file)
|
||||
(ignore-errors (vc-responsible-backend newname)))
|
||||
(vc-rename-file file newname)
|
||||
;; error is caught in -create-files
|
||||
(rename-file file newname ok-if-already-exists))
|
||||
;; Silently rename the visited file of any buffer visiting this file.
|
||||
(and (get-file-buffer file)
|
||||
(with-current-buffer (get-file-buffer file)
|
||||
(set-visited-file-name newname nil t)))
|
||||
(dired-remove-file file)
|
||||
;; See if it's an inserted subdir, and rename that, too.
|
||||
(when file-is-dir-p
|
||||
(dired-rename-subdir file newname))))
|
||||
|
||||
(defun dired-rename-subdir (from-dir to-dir)
|
||||
(setq from-dir (file-name-as-directory from-dir)
|
||||
|
@ -1924,7 +1925,7 @@ unless OK-IF-ALREADY-EXISTS is non-nil."
|
|||
(while blist
|
||||
(with-current-buffer (car blist)
|
||||
(if (and buffer-file-name
|
||||
(file-in-directory-p buffer-file-name expanded-from-dir))
|
||||
(dired-in-this-tree-p buffer-file-name expanded-from-dir))
|
||||
(let ((modflag (buffer-modified-p))
|
||||
(to-file (replace-regexp-in-string
|
||||
(concat "^" (regexp-quote from-dir))
|
||||
|
@ -1943,7 +1944,7 @@ unless OK-IF-ALREADY-EXISTS is non-nil."
|
|||
(while alist
|
||||
(setq elt (car alist)
|
||||
alist (cdr alist))
|
||||
(if (file-in-directory-p (car elt) expanded-dir)
|
||||
(if (dired-in-this-tree-p (car elt) expanded-dir)
|
||||
;; ELT's subdir is affected by the rename
|
||||
(dired-rename-subdir-2 elt dir to)))
|
||||
(if (equal dir default-directory)
|
||||
|
|
|
@ -99,7 +99,7 @@ This variable should never be set directly, but bound before a call to
|
|||
|
||||
;;;###autoload
|
||||
(define-obsolete-function-alias 'mm-default-file-encoding
|
||||
#'mm-default-file-type "future") ;Old bad name.
|
||||
#'mm-default-file-type "28.1") ;Old bad name.
|
||||
;;;###autoload
|
||||
(defun mm-default-file-type (file)
|
||||
"Return a default content type for FILE."
|
||||
|
|
|
@ -222,7 +222,7 @@ rejected, and the function returns nil."
|
|||
|
||||
(defcustom next-error-find-buffer-function #'ignore
|
||||
"Function called to find a `next-error' capable buffer.
|
||||
This functions takes the same three arguments as the function
|
||||
This function takes the same three arguments as the function
|
||||
`next-error-find-buffer', and should return the buffer to be
|
||||
used by the subsequent invocation of the command `next-error'
|
||||
and `previous-error'.
|
||||
|
@ -5289,7 +5289,7 @@ If `kill-append-merge-undo' is non-nil, remove the last undo
|
|||
boundary in the current buffer."
|
||||
(let ((cur (car kill-ring)))
|
||||
(kill-new (if before-p (concat string cur) (concat cur string))
|
||||
(or (string= cur "")
|
||||
(or (= (length cur) 0)
|
||||
(null (get-text-property 0 'yank-handler cur)))))
|
||||
(when (and kill-append-merge-undo (not buffer-read-only))
|
||||
(let ((prev buffer-undo-list)
|
||||
|
|
|
@ -198,6 +198,8 @@ s/ *@WEBP_LIBS@//
|
|||
/^PAXCTL_dumped *=/s/=.*$/=/
|
||||
/^PAXCTL_notdumped *=/s/=.*$/=/
|
||||
/^DUMPING *=/s/@DUMPING@/unexec/
|
||||
/^[ \t]*MAKE_PDUMPER_FINGERPRINT = *$/c\
|
||||
MAKE_PDUMPER_FINGERPRINT =
|
||||
/^lisp\.mk:/,/^$/c\
|
||||
lisp.mk: $(lispsource)/loadup.el\
|
||||
@rm -f $@\
|
||||
|
@ -209,6 +211,10 @@ lisp.mk: $(lispsource)/loadup.el\
|
|||
|
||||
/^ [ ]*\$(AM_V_at)\$(libsrc)\/make-docfile -d/s!make-docfile!make-docfile -o $(etc)/DOC!
|
||||
/ > \$(etc)\/DOC *$/s/ >.*$//
|
||||
/^\$(etc)\/DOC/,/^$/{
|
||||
/^$/i\
|
||||
cd ../src
|
||||
}
|
||||
/^ [ ]*\$(AM_V_GLOBALS)\$(libsrc)\/make-docfile.*>.*globals.tmp/s!make-docfile!make-docfile -o globals.tmp!
|
||||
/^ [ ]*\$(AM_V_GLOBALS)\$(libsrc)\/make-doc/s!>.*$!!
|
||||
/^\$(libsrc)\/make-docfile\$(EXEEXT): /i\
|
||||
|
|
|
@ -180,11 +180,14 @@ s/@PACKAGE@/emacs/
|
|||
/^GL_GNULIB_ENVIRON *=/s/@GL_GNULIB_ENVIRON@/1/
|
||||
/^GL_GNULIB_FDATASYNC *=/s/@GL_GNULIB_FDATASYNC@/1/
|
||||
/^GL_GNULIB_GETLOADAVG *=/s/@GL_GNULIB_GETLOADAVG@/1/
|
||||
/^GL_GNULIB_GETRANDOM *=/s/@GL_GNULIB_GETRANDOM@/1/
|
||||
/^GL_GNULIB_UNISTD_H_GETOPT *=/s/@GL_GNULIB_UNISTD_H_GETOPT@/1/
|
||||
/^GL_GNULIB_MEMMEM *=/s/@GL_GNULIB_MEMMEM@/1/
|
||||
/^GL_GNULIB_MEMRCHR *=/s/@GL_GNULIB_MEMRCHR@/1/
|
||||
/^GL_GNULIB_MEMPCPY *=/s/@GL_GNULIB_MEMPCPY@/1/
|
||||
/^GL_GNULIB_MKOSTEMP *=/s/@GL_GNULIB_MKOSTEMP@/1/
|
||||
/^GL_GNULIB_MKTIME *=/s/@GL_GNULIB_MKTIME@/1/
|
||||
/^GL_GNULIB_SIGDESCR_NP *=/s/@GL_GNULIB_SIGDESCR_NP@/1/
|
||||
/^GL_GNULIB_TIME_R *=/s/@GL_GNULIB_TIME_R@/1/
|
||||
/^GL_GNULIB_TIMEGM *=/s/@GL_GNULIB_TIMEGM@/1/
|
||||
/^GL_GNULIB_TIME_RZ *=/s/@GL_GNULIB_TIME_RZ@/1/
|
||||
|
|
|
@ -22,6 +22,10 @@ along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. */
|
|||
#include <dpmi.h>
|
||||
|
||||
#include "termhooks.h" /* struct terminal */
|
||||
struct terminal;
|
||||
|
||||
extern unsigned int _dos_commit(int);
|
||||
#define tcdrain(f) _dos_commit(f)
|
||||
|
||||
int dos_ttraw (struct tty_display_info *);
|
||||
int dos_ttcooked (void);
|
||||
|
@ -57,6 +61,11 @@ ssize_t readlinkat (int, const char *, char *, size_t);
|
|||
int fstatat (int, char const *, struct stat *, int);
|
||||
int unsetenv (const char *);
|
||||
int faccessat (int, const char *, int, int);
|
||||
int openat (int, const char *, int, int);
|
||||
int fchmodat (int, const char *, mode_t, int);
|
||||
int futimens (int, const struct timespec[2]);
|
||||
int utimensat (int, const char *, const struct timespec[2], int);
|
||||
|
||||
void msdos_fatal_signal (int);
|
||||
void syms_of_msdos (void);
|
||||
int pthread_sigmask (int, const sigset_t *, sigset_t *);
|
||||
|
|
Loading…
Reference in a new issue