diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2020-11-01 13:18:38 -0700 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2020-11-01 13:18:38 -0700 |
| commit | 12e1bc6b16755daf87c97b4c7e4daee67b0276ca (patch) | |
| tree | bca0f32a17e9bbe442ecefae32d798fbb25b670a /lisp/startup.el | |
| parent | 8086a82f24a5d3cb9cad9ce98d93ffa38b1188fb (diff) | |
| parent | 7baf8cae0f54502fc2b21c01e133308b746cd7a0 (diff) | |
| download | emacs-12e1bc6b16755daf87c97b4c7e4daee67b0276ca.tar.gz | |
Merge remote-tracking branch 'origin/master' into athena/unstable
Diffstat (limited to 'lisp/startup.el')
| -rw-r--r-- | lisp/startup.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/startup.el b/lisp/startup.el index 9f6b0601772..b6793e0b776 100644 --- a/lisp/startup.el +++ b/lisp/startup.el @@ -1505,7 +1505,7 @@ Consider using a subdirectory instead, e.g.: %s" (defun x-apply-session-resources () "Apply X resources which specify initial values for Emacs variables. This is called from a window-system initialization function, such -as `x-initialize-window-system' for X, either at startup (prior +as `window-system-initialization' for X, either at startup (prior to reading the init file), or afterwards when the user first opens a graphical frame. |