Remove clone-number support. Provide clone-of parameter in window states.

* window.h (window): Remove clone_number slot.
* window.c (Fwindow_clone_number, Fset_window_clone_number):
Remove.
(make_parent_window, make_window, saved_window)
(Fset_window_configuration, save_window_save): Don't deal with
clone numbers.
* buffer.c (Qclone_number): Remove declaration.
(sort_overlays, overlay_strings): Don't deal with clone numbers.

* window.el (window-state-get-1): Don't assign clone numbers.
Add clone-of item to list of window parameters.
(window-state-put-2): Don't process clone numbers.
(display-buffer-alist): Fix doc-string.

1 files changed, 6 insertions, 17 deletions

diff --git a/src/buffer.c b/src/buffer.c
index 328963be78..006153b042 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -146,7 +146,7 @@ static Lisp_Object Qoverlayp;
 
 Lisp_Object Qpriority, Qbefore_string, Qafter_string;
 
-static Lisp_Object Qclone_number, Qevaporate;
+static Lisp_Object Qevaporate;
 
 Lisp_Object Qmodification_hooks;
 Lisp_Object Qinsert_in_front_hooks;
@@ -2900,13 +2900,10 @@ sort_overlays (Lisp_Object *overlay_vec, ptrdiff_t noverlays, struct window *w)
 	     overlays that are limited to some other window.  */
 	  if (w)
 	    {
-	      Lisp_Object window, clone_number;
+	      Lisp_Object window;
 
 	      window = Foverlay_get (overlay, Qwindow);
-	      clone_number = Foverlay_get (overlay, Qclone_number);
-	      if (WINDOWP (window) && XWINDOW (window) != w
-		  && (! NUMBERP (clone_number)
-		      || XFASTINT (clone_number) != XFASTINT (w->clone_number)))
+	      if (WINDOWP (window) && XWINDOW (window) != w)
 		continue;
 	    }
 
@@ -3035,7 +3032,7 @@ record_overlay_string (struct sortstrlist *ssl, Lisp_Object str,
 EMACS_INT
 overlay_strings (EMACS_INT pos, struct window *w, unsigned char **pstr)
 {
-  Lisp_Object overlay, window, clone_number, str;
+  Lisp_Object overlay, window, str;
   struct Lisp_Overlay *ov;
   EMACS_INT startpos, endpos;
   int multibyte = ! NILP (BVAR (current_buffer, enable_multibyte_characters));
@@ -3054,12 +3051,8 @@ overlay_strings (EMACS_INT pos, struct window *w, unsigned char **pstr)
       if (endpos != pos && startpos != pos)
 	continue;
       window = Foverlay_get (overlay, Qwindow);
-      clone_number = Foverlay_get (overlay, Qclone_number);
-      if (WINDOWP (window) && XWINDOW (window) != w
-	  && (! NUMBERP (clone_number)
-	      || XFASTINT (clone_number) != XFASTINT (w->clone_number)))
+      if (WINDOWP (window) && XWINDOW (window) != w)
 	continue;
-
       if (startpos == pos
 	  && (str = Foverlay_get (overlay, Qbefore_string), STRINGP (str)))
 	record_overlay_string (&overlay_heads, str,
@@ -3086,10 +3079,7 @@ overlay_strings (EMACS_INT pos, struct window *w, unsigned char **pstr)
       if (endpos != pos && startpos != pos)
 	continue;
       window = Foverlay_get (overlay, Qwindow);
-      clone_number = Foverlay_get (overlay, Qclone_number);
-      if (WINDOWP (window) && XWINDOW (window) != w
-	  && (! NUMBERP (clone_number)
-	      || XFASTINT (clone_number) != XFASTINT (w->clone_number)))
+      if (WINDOWP (window) && XWINDOW (window) != w)
 	continue;
       if (startpos == pos
 	  && (str = Foverlay_get (overlay, Qbefore_string), STRINGP (str)))
@@ -5229,7 +5219,6 @@ syms_of_buffer (void)
   DEFSYM (Qinsert_behind_hooks, "insert-behind-hooks");
   DEFSYM (Qget_file_buffer, "get-file-buffer");
   DEFSYM (Qpriority, "priority");
-  DEFSYM (Qclone_number, "clone-number");
   DEFSYM (Qbefore_string, "before-string");
   DEFSYM (Qafter_string, "after-string");
   DEFSYM (Qfirst_change_hook, "first-change-hook");