Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
emacs
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
4
Issues
4
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
emacs
emacs
Commits
1abfd3e8
Commit
1abfd3e8
authored
Feb 24, 2013
by
Glenn Morris
Browse files
Options
Browse Files
Download
Plain Diff
Merge from emacs-24; up to 2012-12-22T19:09:52Z!rgm@gnu.org
parents
4b9f0b67
c0c2eb82
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
48 additions
and
18 deletions
+48
-18
doc/lispref/ChangeLog
doc/lispref/ChangeLog
+4
-0
doc/lispref/files.texi
doc/lispref/files.texi
+2
-1
doc/misc/ChangeLog
doc/misc/ChangeLog
+7
-0
doc/misc/tramp.texi
doc/misc/tramp.texi
+19
-14
etc/TODO
etc/TODO
+0
-2
src/ChangeLog
src/ChangeLog
+14
-0
src/filelock.c
src/filelock.c
+1
-1
src/xdisp.c
src/xdisp.c
+1
-0
No files found.
doc/lispref/ChangeLog
View file @
1abfd3e8
2013-02-24 Eli Zaretskii <eliz@gnu.org>
* files.texi (Magic File Names): Improve wording and indexing.
2013-02-21 Glenn Morris <rgm@gnu.org>
* display.texi (Multi-Frame Images): Minor rephrasing.
...
...
doc/lispref/files.texi
View file @
1abfd3e8
...
...
@@ -2681,7 +2681,7 @@ no prefix argument is given, and @code{nil} otherwise.
You can implement special handling for certain file names. This is
called making those names @dfn{magic}. The principal use for this
feature is in implementing
remote file nam
es (@pxref{Remote Files,,
feature is in implementing
access to remote fil
es (@pxref{Remote Files,,
Remote Files, emacs, The GNU Emacs Manual}).
To define a kind of magic file name, you must supply a regular
...
...
@@ -2689,6 +2689,7 @@ expression to define the class of names (all those that match the
regular expression), plus a handler that implements all the primitive
Emacs file operations for file names that match.
@cindex file handler
@vindex file-name-handler-alist
The variable @code{file-name-handler-alist} holds a list of handlers,
together with regular expressions that determine when to apply each
...
...
doc/misc/ChangeLog
View file @
1abfd3e8
2013-02-24 Michael Albinus <michael.albinus@gmx.de>
Port Tramp documentation to Texinfo 5.0.
* tramp.texi (top) [xxx, yyy, trampfn]: Remove superfluous @c.
(Filename Syntax): Do not use @trampfn{} in @item.
(Filename completion): Use @columnfractions in @multitable.
2013-02-22 Glenn Morris <rgm@gnu.org>
* flymake.texi (Syntax check statuses): Fix multitable continued rows.
...
...
doc/misc/tramp.texi
View file @
1abfd3e8
...
...
@@ -20,20 +20,23 @@
@c xxx and yyy are auxiliary macros in order to omit leading and
@c trailing whitespace. Not very elegant, but I don't know it better.
@macro xxx
{
one
}
@c
@set
\one\
@
c
@macro xxx
{
one
}
@set
\one\
@end macro
@macro yyy
{
one, two
}
@c
@macro yyy
{
one, two
}
@xxx
{
x
\one\}
@c
@ifclear x
@c
@ifclear x
\one\@
w
{}
\two\@
c
@end ifclear
@clear x
\one\
@
c
@clear x
\one\
@end macro
@macro trampfn
{
method, user, host, localname
}
@c
@value
{
prefix
}
@yyy
{
\method\,
@value
{
postfixhop
}}
@yyy
{
\user\,
@@
}
\host\@
value
{
postfix
}
\localname\@
c
@macro trampfn
{
method, user, host, localname
}
@value
{
prefix
}
@c
@yyy
{
\method\,
@value
{
postfixhop
}}
@c
@yyy
{
\user\,
@@
}
@c
\host\@
value
{
postfix
}
\localname\
@end macro
@copying
...
...
@@ -2323,25 +2326,25 @@ using the default method. @xref{Default Method}.
Some examples of @value
{
tramp
}
filenames are shown below.
@table @file
@item @
trampfn
{
, , melancholia, .emacs
}
@item @
value
{
prefix
}
melancholia@value
{
postfix
}
.emacs
Edit the file @file
{
.emacs
}
in your home directory on the machine
@code
{
melancholia
}
.
@item @
trampfn
{
, , melancholia.danann.net, .emacs
}
@item @
value
{
prefix
}
melancholia.danann.net@value
{
postfix
}
.emacs
This edits the same file, using the fully qualified domain name of
the machine.
@item @
trampfn
{
, , melancholia, ~
/
.emacs
}
@item @
value
{
prefix
}
melancholia@value
{
postfix
}
~
/
.emacs
This also edits the same file; the @file
{
~
}
is expanded to your
home directory on the remote machine, just like it is locally.
@item @
trampfn
{
, , melancholia, ~daniel
/
.emacs
}
@item @
value
{
prefix
}
melancholia@value
{
postfix
}
~daniel
/
.emacs
This edits the file @file
{
.emacs
}
in the home directory of the user
@code
{
daniel
}
on the machine @code
{
melancholia
}
. The @file
{
~<user>
}
construct is expanded to the home directory of that user on the remote
machine.
@item @
trampfn
{
, , melancholia,
/
etc
/
squid.conf
}
@item @
value
{
prefix
}
melancholia@value
{
postfix
}
/
etc
/
squid.conf
This edits the file @file
{
/
etc
/
squid.conf
}
on the machine
@code
{
melancholia
}
.
...
...
@@ -2453,7 +2456,8 @@ If you, for example, type @kbd{C-x C-f @value{prefix}t
@key
{
TAB
}}
, @value
{
tramp
}
might give you as result the choice for
@example
@multitable
{
@trampfn
{
telnet, , melancholia.danann.net,
}}
{
@trampfn
{
telnet, ,
192
.
168
.
0
.
1
,
}}
@c @multitable
{
@trampfn
{
telnet, , melancholia.danann.net,
}}
{
@trampfn
{
telnet, ,
192
.
168
.
0
.
1
,
}}
@multitable @columnfractions .
5
.
5
@ifset emacs
@item @value
{
prefixhop
}
telnet@value
{
postfixhop
}
@tab tmp
/
@item @value
{
prefixhop
}
toto@value
{
postfix
}
@tab
...
...
@@ -2480,7 +2484,8 @@ Next @kbd{@key{TAB}} brings you all machine names @value{tramp} detects in
your @file
{
/
etc
/
hosts
}
file, let's say
@example
@multitable
{
@trampfn
{
telnet, , melancholia.danann.net,
}}
{
@trampfn
{
telnet, ,
192
.
168
.
0
.
1
,
}}
@multitable @columnfractions .
5
.
5
@c @multitable
{
@trampfn
{
telnet, , melancholia.danann.net,
}}
{
@trampfn
{
telnet, ,
192
.
168
.
0
.
1
,
}}
@item @trampfn
{
telnet, ,
127
.
0
.
0
.
1
,
}
@tab @trampfn
{
telnet, ,
192
.
168
.
0
.
1
,
}
@item @trampfn
{
telnet, , @value
{
ipv
6
prefix
}
::
1
@value
{
ipv
6
postfix
}
,
}
@tab @trampfn
{
telnet, , localhost,
}
@item @trampfn
{
telnet, , melancholia.danann.net,
}
@tab @trampfn
{
telnet, , melancholia,
}
...
...
etc/TODO
View file @
1abfd3e8
...
...
@@ -107,8 +107,6 @@ for users to customize.
** Distribute a bar cursor of width > 1 evenly between the two glyphs
on each side of the bar (what to do at the edges?).
** buffer-offer-save should be a permanent local.
** revert-buffer should eliminate overlays and the mark.
For related problems consult the thread starting with
http://lists.gnu.org/archive/html/emacs-devel/2005-11/msg01346.html
...
...
src/ChangeLog
View file @
1abfd3e8
2013-02-24 Andreas Schwab <schwab@linux-m68k.org>
* xdisp.c (set_message): Only check for debug-on-message if STRING
is a string. (Bug#13797)
2013-02-24 Paul Eggert <eggert@cs.ucla.edu>
Fix regression introduced by July 10 filelock.c patch.
* filelock.c (fill_in_lock_file_name): Fix crash caused by the
2012-07-10 patch to this file. Reported by Eli Zaretskii in
<http://lists.gnu.org/archive/html/emacs-devel/2013-02/msg00533.html>
and diagnosed by Andreas Schwab in
<http://lists.gnu.org/archive/html/emacs-devel/2013-02/msg00534.html>.
2013-02-22 Paul Eggert <eggert@cs.ucla.edu>
Assume C89 or better.
...
...
src/filelock.c
View file @
1abfd3e8
...
...
@@ -316,7 +316,7 @@ fill_in_lock_file_name (register char *lockfile, register Lisp_Object fn)
p
[
1
]
=
'.'
;
p
[
2
]
=
'#'
;
p
=
p
+
length
+
2
;
p
=
lockfile
+
length
+
2
;
while
(
lstat
(
lockfile
,
&
st
)
==
0
&&
!
S_ISLNK
(
st
.
st_mode
))
{
...
...
src/xdisp.c
View file @
1abfd3e8
...
...
@@ -10525,6 +10525,7 @@ set_message (Lisp_Object string)
help_echo_showing_p = 0;
if (STRINGP (Vdebug_on_message)
&& STRINGP (string)
&& fast_string_match (Vdebug_on_message, string) >= 0)
call_debugger (list2 (Qerror, string));
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment