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
1
Issues
1
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
d528b1ce
Commit
d528b1ce
authored
Nov 03, 2009
by
Stefan Monnier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
(save_restriction_restore): Update the (pt/begv/vz)_markers
when applicable (bug#4851).
parent
524420d2
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
34 additions
and
16 deletions
+34
-16
src/ChangeLog
src/ChangeLog
+16
-13
src/editfns.c
src/editfns.c
+18
-3
No files found.
src/ChangeLog
View file @
d528b1ce
2009-11-03 Stefan Monnier <monnier@iro.umontreal.ca>
* editfns.c (save_restriction_restore): Update the (pt/begv/vz)_markers
when applicable (bug#4851).
* lisp.h: Make USE_LSB_TAG work with USE_LISP_UNION_TYPE.
(P_): Support for prototypes is now required.
...
...
@@ -10,14 +13,14 @@
2009-10-30 Eli Zaretskii <eliz@gnu.org>
* s/msdos.h (SYSTEM_PURESIZE_EXTRA): Redefine to waste less pure
space.
* s/msdos.h (SYSTEM_PURESIZE_EXTRA): Redefine to waste less pure space.
2009-10-30 Dan Nicolaescu <dann@ics.uci.edu>
* puresize.h (BASE_PURESIZE): Increase to 1470000.
* lread.c (Fload): Purecopy the file name when building Vpreloaded_file_list.
* lread.c (Fload): Purecopy the file name when building
Vpreloaded_file_list.
2009-10-29 Jason Rumney <jasonr@wanchan.jasonrumney.net>
...
...
@@ -55,7 +58,7 @@
* dired.c (Ffile_attributes): Simplify now that FIXNUM_OVERFLOW_P
can properly handle unsigned types.
(make_uid, make_gid): Remove
d
.
(make_uid, make_gid): Remove.
* lisp.h (FIXNUM_OVERFLOW_P): Fix last change to handle unsigned
types again.
...
...
@@ -108,10 +111,11 @@
(handle_one_xevent): Set pending_event_wait.eventtype to 0 if we
see pending_event_wait.eventtype.
(handle_one_xevent): Don't change gravity when parent changes.
(x_new_font): Call change_frame_size with new rows/columns before we
try
to resize the frame.
(x_new_font): Call change_frame_size with new rows/columns before we
t
ry t
o resize the frame.
(x_wait_for_event): New function.
(x_set_window_size_1): Don't change gravity unless change_gravity is set.
(x_set_window_size_1): Don't change gravity unless change_gravity
is set.
Call XResizeWindow with FRAME_OUTER_WINDOW. If we are visible,
don't change frame size, instead wait for the ConfigureNotify.
(x_set_window_size): Call x_set_window_size_1 for USE_X_TOOLKIT also.
...
...
@@ -126,7 +130,7 @@
* gtkutil.c (xg_frame_set_char_size): Flush events and call
x_wait_for_event.
(flush_and_sync): Remove
d
again.
(flush_and_sync): Remove again.
(xg_get_font_name): Suggest monospace if no previous font is known.
2009-10-20 Stefan Monnier <monnier@iro.umontreal.ca>
...
...
@@ -329,8 +333,7 @@
(ns_findfonts, nsfont_list_family): Use long format in printf, and
cast argument.
(nsfont_open): Use ns_char_width() everywhere.
(ns_uni_to_glyphs, NSGlyphStorage): Use NS[U]Integer where
appropriate.
(ns_uni_to_glyphs, NSGlyphStorage): Use NS[U]Integer where appropriate.
* nsgui.h (NSPoint, NSSize) [!__OBJC__]: Define and use CGFloat.
...
...
@@ -399,7 +402,7 @@
2009-10-02 Michael Albinus <michael.albinus@gmx.de>
* lisp.h (Qdelete_directory_internal): Remove
d
, because it is not
* lisp.h (Qdelete_directory_internal): Remove, because it is not
used anymore outside fileio.c.
* w32fns.c (Fsystem_move_file_to_trash): Use delete-directory.
...
...
@@ -474,8 +477,8 @@
2009-09-24 Juanma Barranquero <lekktu@gmail.com>
* frame.c (xrdb_get_resource): Return nil for empty string resources;
some parts of Emacs code (like font selection) don't grok them.
See
http://lists.gnu.org/archive/html/emacs-devel/2009-09/msg00528.html
some parts of Emacs code (like font selection) don't grok them.
See
http://lists.gnu.org/archive/html/emacs-devel/2009-09/msg00528.html
2009-09-24 Andreas Schwab <schwab@redhat.com>
...
...
src/editfns.c
View file @
d528b1ce
...
...
@@ -3275,12 +3275,26 @@ Lisp_Object
save_restriction_restore
(
data
)
Lisp_Object
data
;
{
struct
buffer
*
cur
=
NULL
;
struct
buffer
*
buf
=
(
CONSP
(
data
)
?
XMARKER
(
XCAR
(
data
))
->
buffer
:
XBUFFER
(
data
));
if
(
buf
&&
buf
!=
current_buffer
&&
!
NILP
(
buf
->
pt_marker
))
{
/* If `buf' uses markers to keep track of PT, BEGV, and ZV (as
is the case if it is or has an indirect buffer), then make
sure it is current before we update BEGV, so
set_buffer_internal takes care of managing those markers. */
cur
=
current_buffer
;
set_buffer_internal
(
buf
);
}
if
(
CONSP
(
data
))
/* A pair of marks bounding a saved restriction. */
{
struct
Lisp_Marker
*
beg
=
XMARKER
(
XCAR
(
data
));
struct
Lisp_Marker
*
end
=
XMARKER
(
XCDR
(
data
));
struct
buffer
*
buf
=
beg
->
buffer
;
/* END should have the same buffer. */
eassert
(
buf
==
end
->
buffer
);
if
(
buf
/* Verify marker still points to a buffer. */
&&
(
beg
->
charpos
!=
BUF_BEGV
(
buf
)
||
end
->
charpos
!=
BUF_ZV
(
buf
)))
...
...
@@ -3305,8 +3319,6 @@ save_restriction_restore (data)
else
/* A buffer, which means that there was no old restriction. */
{
struct
buffer
*
buf
=
XBUFFER
(
data
);
if
(
buf
/* Verify marker still points to a buffer. */
&&
(
BUF_BEGV
(
buf
)
!=
BUF_BEG
(
buf
)
||
BUF_ZV
(
buf
)
!=
BUF_Z
(
buf
)))
/* The buffer has been narrowed, get rid of the narrowing. */
...
...
@@ -3318,6 +3330,9 @@ save_restriction_restore (data)
}
}
if
(
cur
)
set_buffer_internal
(
cur
);
return
Qnil
;
}
...
...
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