Commit 0797897f authored by Glenn Morris's avatar Glenn Morris

Merge from origin/emacs-26

a1c53d42 (origin/emacs-26) * admin/admin.el (make-manuals-dist--1): Up...
d0f745f6 Document some compilation-mode faces
23ccba0c Mention the assignment form in "Copyright Assignment"
0f5568ea Fix confusing wording in the user manual
70ec3928 Fix the MSDOS build when running under CWSDPMI
7a608fc6 * lisp/progmodes/python.el: Be more careful about temp file r...
parents 41d9004e a1c53d42
Pipeline #1330 failed with stage
in 49 minutes and 56 seconds
...@@ -696,6 +696,7 @@ style=\"text-align:left\">") ...@@ -696,6 +696,7 @@ style=\"text-align:left\">")
(if (file-directory-p stem) (if (file-directory-p stem)
(delete-directory stem t)) (delete-directory stem t))
(make-directory stem) (make-directory stem)
(setq stem (file-name-as-directory stem))
(copy-file "../doc/misc/texinfo.tex" stem) (copy-file "../doc/misc/texinfo.tex" stem)
(unless (equal type "emacs") (unless (equal type "emacs")
(copy-file "../doc/emacs/emacsver.texi" stem) (copy-file "../doc/emacs/emacsver.texi" stem)
...@@ -718,7 +719,7 @@ style=\"text-align:left\">") ...@@ -718,7 +719,7 @@ style=\"text-align:left\">")
(setq ats t) (setq ats t)
(message "Unexpanded: %s" (match-string 0))) (message "Unexpanded: %s" (match-string 0)))
(if ats (error "Unexpanded configure variables in Makefile?"))) (if ats (error "Unexpanded configure variables in Makefile?")))
(write-region nil nil (expand-file-name (format "%s/Makefile" stem)) (write-region nil nil (expand-file-name (format "%sMakefile" stem))
nil 'silent)) nil 'silent))
(call-process "tar" nil nil nil "-cf" tarfile stem) (call-process "tar" nil nil nil "-cf" tarfile stem)
(delete-directory stem t) (delete-directory stem t)
......
...@@ -151,6 +151,20 @@ with the mouse (@pxref{Mouse References}), to visit the @dfn{locus} of ...@@ -151,6 +151,20 @@ with the mouse (@pxref{Mouse References}), to visit the @dfn{locus} of
the error message in a separate window. The locus is the specific the error message in a separate window. The locus is the specific
position in a file where that error occurred. position in a file where that error occurred.
@cindex compilation mode faces
@vindex compilation-error
@vindex compilation-warning
The appearance of the @file{*compilation*} buffer can be controlled
by customizing the faces which are used to highlight parts of the
@file{*compilation*} buffer, e.g., @code{compilation-error} or
@code{compilation-warning}, for error and warning messages
respectively. Note that since those faces inherit from the
@code{error} and @code{warning} faces, it is also possible to
customize the parent face directly instead.
Use @w{@kbd{M-x customize-group RET compilation}} to see the entire
list of customization variables and faces.
@findex compile-goto-error @findex compile-goto-error
@vindex compilation-auto-jump-to-first-error @vindex compilation-auto-jump-to-first-error
If you change the variable If you change the variable
......
...@@ -1093,8 +1093,7 @@ started editing, and asks for confirmation for discarding the changes. ...@@ -1093,8 +1093,7 @@ started editing, and asks for confirmation for discarding the changes.
If you agree, the fileset is reverted. If you don't want @kbd{C-x v If you agree, the fileset is reverted. If you don't want @kbd{C-x v
u} to show a diff, set the variable @code{vc-revert-show-diff} to u} to show a diff, set the variable @code{vc-revert-show-diff} to
@code{nil} (you can still view the diff directly with @kbd{C-x v =}; @code{nil} (you can still view the diff directly with @kbd{C-x v =};
@pxref{Old Revisions}). Note that @kbd{C-x v u} cannot be reversed @pxref{Old Revisions}).
with the usual undo commands (@pxref{Undo}), so use it with care.
On locking-based version control systems, @kbd{C-x v u} leaves files On locking-based version control systems, @kbd{C-x v u} leaves files
unlocked; you must lock again to resume editing. You can also use unlocked; you must lock again to resume editing. You can also use
......
...@@ -1400,9 +1400,10 @@ to the FSF@. For the reasons behind this, see ...@@ -1400,9 +1400,10 @@ to the FSF@. For the reasons behind this, see
@url{https://www.gnu.org/licenses/why-assign.html}. @url{https://www.gnu.org/licenses/why-assign.html}.
Copyright assignment is a simple process. Residents of some countries Copyright assignment is a simple process. Residents of some countries
can do it entirely electronically. We can help you get started, and can do it entirely electronically. We can help you get started,
answer any questions you may have (or point you to the people with the including sending you the forms you should fill, and answer any
answers), at the @email{emacs-devel@@gnu.org} mailing list. questions you may have (or point you to the people with the answers),
at the @email{emacs-devel@@gnu.org} mailing list.
(Please note: general discussion about why some GNU projects ask (Please note: general discussion about why some GNU projects ask
for a copyright assignment is off-topic for emacs-devel. for a copyright assignment is off-topic for emacs-devel.
......
...@@ -2303,15 +2303,16 @@ detection and just returns nil." ...@@ -2303,15 +2303,16 @@ detection and just returns nil."
;; carriage returns in unbuffered mode. ;; carriage returns in unbuffered mode.
(let ((inhibit-eol-conversion (getenv "PYTHONUNBUFFERED"))) (let ((inhibit-eol-conversion (getenv "PYTHONUNBUFFERED")))
(python-shell--save-temp-file code)))) (python-shell--save-temp-file code))))
;; Use `process-file' as it is remote-host friendly. (unwind-protect
(process-file ;; Use `process-file' as it is remote-host friendly.
interpreter (process-file
code-file interpreter
'(t nil) code-file
nil '(t nil)
interpreter-arg) nil
;; Try to cleanup interpreter-arg)
(delete-file code-file))) ;; Try to cleanup
(delete-file code-file))))
(buffer-string))) (buffer-string)))
(prompts (prompts
(catch 'prompts (catch 'prompts
......
...@@ -6142,6 +6142,7 @@ init_display_interactive (void) ...@@ -6142,6 +6142,7 @@ init_display_interactive (void)
t->reference_count++; t->reference_count++;
#ifdef MSDOS #ifdef MSDOS
f->output_data.tty = &the_only_tty_output;
f->output_data.tty->display_info = &the_only_display_info; f->output_data.tty->display_info = &the_only_display_info;
#else #else
if (f->output_method == output_termcap) if (f->output_method == output_termcap)
......
...@@ -1118,6 +1118,7 @@ make_terminal_frame (struct terminal *terminal) ...@@ -1118,6 +1118,7 @@ make_terminal_frame (struct terminal *terminal)
f->terminal = terminal; f->terminal = terminal;
f->terminal->reference_count++; f->terminal->reference_count++;
#ifdef MSDOS #ifdef MSDOS
f->output_data.tty = &the_only_tty_output;
f->output_data.tty->display_info = &the_only_display_info; f->output_data.tty->display_info = &the_only_display_info;
if (!inhibit_window_system if (!inhibit_window_system
&& (!FRAMEP (selected_frame) || !FRAME_LIVE_P (XFRAME (selected_frame)) && (!FRAMEP (selected_frame) || !FRAME_LIVE_P (XFRAME (selected_frame))
......
...@@ -420,6 +420,9 @@ static unsigned short outside_cursor; ...@@ -420,6 +420,9 @@ static unsigned short outside_cursor;
/* The only display since MS-DOS does not support multiple ones. */ /* The only display since MS-DOS does not support multiple ones. */
struct tty_display_info the_only_display_info; struct tty_display_info the_only_display_info;
/* The only tty_output, since MS-DOS supports only 1 display. */
struct tty_output the_only_tty_output;
/* Support for DOS/V (allows Japanese characters to be displayed on /* Support for DOS/V (allows Japanese characters to be displayed on
standard, non-Japanese, ATs). Only supported for DJGPP v2 and later. */ standard, non-Japanese, ATs). Only supported for DJGPP v2 and later. */
......
...@@ -93,6 +93,7 @@ typedef int XRectangle; ...@@ -93,6 +93,7 @@ typedef int XRectangle;
typedef struct tty_display_info Display_Info; typedef struct tty_display_info Display_Info;
extern struct tty_display_info the_only_display_info; extern struct tty_display_info the_only_display_info;
extern struct tty_output the_only_tty_output;
#define FRAME_X_DISPLAY(f) ((Display *) 0) #define FRAME_X_DISPLAY(f) ((Display *) 0)
#define FRAME_FONT(f) ((f)->output_data.tty->font) #define FRAME_FONT(f) ((f)->output_data.tty->font)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment